diff --git a/.gitattributes b/.gitattributes index 1ff3ddc8d25..8700e05310a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Binary files *.jpg git-encoding=BINARY working-tree-encoding=BINARY diff --git a/.github/runlint.sh b/.github/runlint.sh index 6414e4fffd7..6c527bce3c8 100755 --- a/.github/runlint.sh +++ b/.github/runlint.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Exit immediately if any unexpected error occurs. diff --git a/.github/workflows/autoTestPR.yml b/.github/workflows/autoTestPR.yml index ebd7bfe6943..b163cac1742 100644 --- a/.github/workflows/autoTestPR.yml +++ b/.github/workflows/autoTestPR.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ###############################################################################/ name: "Auto test PR" diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index ff7e7e8ec51..b5898606eed 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ###############################################################################/ name: Linter diff --git a/.github/workflows/rmAutoTestPRBranch.yml b/.github/workflows/rmAutoTestPRBranch.yml index e1ff4da21c2..6b4a3b16922 100644 --- a/.github/workflows/rmAutoTestPRBranch.yml +++ b/.github/workflows/rmAutoTestPRBranch.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ###############################################################################/ name: "Remove autoTestPR branch" diff --git a/.github/workflows/runAqa.yml b/.github/workflows/runAqa.yml index 9ad0157a393..6606f873efe 100644 --- a/.github/workflows/runAqa.yml +++ b/.github/workflows/runAqa.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ###############################################################################/ name: "PR Comment Build Action for openj9" diff --git a/.gitignore b/.gitignore index c279099673e..9404084c9bd 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *.jar *.zip diff --git a/CMakeLists.txt b/CMakeLists.txt index 22b97238f78..60103e8649f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ cmake_minimum_required(VERSION 3.4 FATAL_ERROR) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0f6960b58c..cc76822aded 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Contributing to Eclipse OpenJ9 @@ -241,6 +241,6 @@ The template for the copyright notice and dual-license is as follows: * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ ``` diff --git a/LICENSE b/LICENSE index 1dbda9ed19f..220ba183263 100644 --- a/LICENSE +++ b/LICENSE @@ -9,7 +9,7 @@ This Source Code may also be made available under the following Secondary Licens [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Subject to the following notices: diff --git a/README.md b/README.md index 09b7c251323..335f859cc3a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 -->

diff --git a/about.html b/about.html index 97a1df086af..2e3979aa9af 100644 --- a/about.html +++ b/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/buildenv/Build_Instructions_V11.md b/buildenv/Build_Instructions_V11.md index 4b725f60da0..2046cb56446 100644 --- a/buildenv/Build_Instructions_V11.md +++ b/buildenv/Build_Instructions_V11.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> This document has moved to the `/doc` folder. Click [here](../doc/build-instructions/Build_Instructions_V11.md) to access the document. diff --git a/buildenv/Build_Instructions_V8.md b/buildenv/Build_Instructions_V8.md index d3c11eebc5e..c1753b6bf9c 100644 --- a/buildenv/Build_Instructions_V8.md +++ b/buildenv/Build_Instructions_V8.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> This document has moved to the `/doc` folder. Click [here](../doc/build-instructions/Build_Instructions_V8.md) to access the document. diff --git a/buildenv/aix/jdk11/yum_install_aix-ppc64.txt b/buildenv/aix/jdk11/yum_install_aix-ppc64.txt index 4e24716ab0f..a8fc8d5ff4f 100644 --- a/buildenv/aix/jdk11/yum_install_aix-ppc64.txt +++ b/buildenv/aix/jdk11/yum_install_aix-ppc64.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file installs package dependencies for building OpenJDK V11 with OpenJ9 on AIX 64-bit systems # To use this file, specify `yum shell yum_install_aix-ppc64.txt` diff --git a/buildenv/aix/jdk17/yum_install_aix-ppc64.txt b/buildenv/aix/jdk17/yum_install_aix-ppc64.txt index 8b90e1027cb..0b5e16699b9 100644 --- a/buildenv/aix/jdk17/yum_install_aix-ppc64.txt +++ b/buildenv/aix/jdk17/yum_install_aix-ppc64.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file installs package dependencies for building OpenJDK V17 with OpenJ9 on AIX 64-bit systems # To use this file, specify `yum shell yum_install_aix-ppc64.txt` diff --git a/buildenv/aix/jdk19/yum_install_aix-ppc64.txt b/buildenv/aix/jdk19/yum_install_aix-ppc64.txt index 81ec73504f4..e02037f72c6 100644 --- a/buildenv/aix/jdk19/yum_install_aix-ppc64.txt +++ b/buildenv/aix/jdk19/yum_install_aix-ppc64.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file installs package dependencies for building OpenJDK V18 with OpenJ9 on AIX 64-bit systems # To use this file, specify `yum shell yum_install_aix-ppc64.txt` diff --git a/buildenv/aix/jdk20/yum_install_aix-ppc64.txt b/buildenv/aix/jdk20/yum_install_aix-ppc64.txt index 81ec73504f4..e02037f72c6 100644 --- a/buildenv/aix/jdk20/yum_install_aix-ppc64.txt +++ b/buildenv/aix/jdk20/yum_install_aix-ppc64.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file installs package dependencies for building OpenJDK V18 with OpenJ9 on AIX 64-bit systems # To use this file, specify `yum shell yum_install_aix-ppc64.txt` diff --git a/buildenv/aix/jdk8/yum_install_aix-ppc64.txt b/buildenv/aix/jdk8/yum_install_aix-ppc64.txt index 85d5e522e71..599e0bd90e4 100644 --- a/buildenv/aix/jdk8/yum_install_aix-ppc64.txt +++ b/buildenv/aix/jdk8/yum_install_aix-ppc64.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file installs package dependencies for building OpenJDK V8 with OpenJ9 on AIX 64-bit systems # To use this file, specify `yum shell yum_install_aix-ppc64.txt` diff --git a/buildenv/ansible/inventories/local/hosts b/buildenv/ansible/inventories/local/hosts index 245a4361b1b..e61bb26935b 100644 --- a/buildenv/ansible/inventories/local/hosts +++ b/buildenv/ansible/inventories/local/hosts @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### all: vars: diff --git a/buildenv/ansible/openj9-docker-image.yml b/buildenv/ansible/openj9-docker-image.yml index e1e98f3d4df..17d4279410f 100644 --- a/buildenv/ansible/openj9-docker-image.yml +++ b/buildenv/ansible/openj9-docker-image.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### --- # This playbook builds the OpenJ9 JVM and publishes it as a Docker image diff --git a/buildenv/ansible/roles/openj9-build-environment/tasks/main.yml b/buildenv/ansible/roles/openj9-build-environment/tasks/main.yml index 9ba6e25739e..9ade449304a 100644 --- a/buildenv/ansible/roles/openj9-build-environment/tasks/main.yml +++ b/buildenv/ansible/roles/openj9-build-environment/tasks/main.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Copyright IBM Corp. and others 2020 ############################################################################### diff --git a/buildenv/ansible/roles/openj9-cleanup-build-environment/tasks/main.yml b/buildenv/ansible/roles/openj9-cleanup-build-environment/tasks/main.yml index 00c3ea1eb94..130d6a83bf1 100644 --- a/buildenv/ansible/roles/openj9-cleanup-build-environment/tasks/main.yml +++ b/buildenv/ansible/roles/openj9-cleanup-build-environment/tasks/main.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Copyright IBM Corp. and others 2020 ############################################################################### diff --git a/buildenv/ansible/roles/openj9-from-sources/tasks/main.yml b/buildenv/ansible/roles/openj9-from-sources/tasks/main.yml index 4cc4922236c..f758a5fbb2e 100644 --- a/buildenv/ansible/roles/openj9-from-sources/tasks/main.yml +++ b/buildenv/ansible/roles/openj9-from-sources/tasks/main.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### --- - name: Checkout ibmruntimes diff --git a/buildenv/ansible/roles/openj9-image/files/Dockerfile-ubuntu b/buildenv/ansible/roles/openj9-image/files/Dockerfile-ubuntu index 230f99c70ba..bdf081ec95c 100644 --- a/buildenv/ansible/roles/openj9-image/files/Dockerfile-ubuntu +++ b/buildenv/ansible/roles/openj9-image/files/Dockerfile-ubuntu @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### FROM ubuntu:16.04 diff --git a/buildenv/ansible/roles/openj9-image/tasks/main.yml b/buildenv/ansible/roles/openj9-image/tasks/main.yml index 0b61fa7bc56..e07efeb99a3 100644 --- a/buildenv/ansible/roles/openj9-image/tasks/main.yml +++ b/buildenv/ansible/roles/openj9-image/tasks/main.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### --- - set_fact: diff --git a/buildenv/docker/.dockerignore b/buildenv/docker/.dockerignore index b8ebe93187a..332933ac62b 100644 --- a/buildenv/docker/.dockerignore +++ b/buildenv/docker/.dockerignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Ignore everything except select files. * diff --git a/buildenv/docker/.gitignore b/buildenv/docker/.gitignore index 2db36e5ac40..64e34fc9b98 100644 --- a/buildenv/docker/.gitignore +++ b/buildenv/docker/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /authorized_keys /known_hosts diff --git a/buildenv/docker/aarch64-linux_CC/Dockerfile b/buildenv/docker/aarch64-linux_CC/Dockerfile index f2a7839ac59..bf7824545e2 100644 --- a/buildenv/docker/aarch64-linux_CC/Dockerfile +++ b/buildenv/docker/aarch64-linux_CC/Dockerfile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # To use this docker file: # docker build -t=openj9aarch64 . diff --git a/buildenv/docker/armhf-linux_CC/Dockerfile b/buildenv/docker/armhf-linux_CC/Dockerfile index c07e753f22b..5204abae88e 100644 --- a/buildenv/docker/armhf-linux_CC/Dockerfile +++ b/buildenv/docker/armhf-linux_CC/Dockerfile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 FROM ubuntu:16.04 diff --git a/buildenv/docker/mkdocker.sh b/buildenv/docker/mkdocker.sh index 58e7971fd57..f8765dee68d 100644 --- a/buildenv/docker/mkdocker.sh +++ b/buildenv/docker/mkdocker.sh @@ -20,7 +20,7 @@ cat <<- EOF # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 EOF } diff --git a/buildenv/docker/test/Dockerfile b/buildenv/docker/test/Dockerfile index 1544a2c56a6..9f44ffe2973 100644 --- a/buildenv/docker/test/Dockerfile +++ b/buildenv/docker/test/Dockerfile @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # To use this docker file: # 1.Depends on your OS platform, build the base openj9 docker diff --git a/buildenv/docker/test/README.md b/buildenv/docker/test/README.md index 30deefcea03..2fd22339224 100644 --- a/buildenv/docker/test/README.md +++ b/buildenv/docker/test/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # To use this docker file: diff --git a/buildenv/jenkins/ARTIFACTORY.md b/buildenv/jenkins/ARTIFACTORY.md index 257181d98e8..eb1e5c75e86 100644 --- a/buildenv/jenkins/ARTIFACTORY.md +++ b/buildenv/jenkins/ARTIFACTORY.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # About Artifactory is a binary repository manager. diff --git a/buildenv/jenkins/README.md b/buildenv/jenkins/README.md index a782461edcc..2208db6e822 100644 --- a/buildenv/jenkins/README.md +++ b/buildenv/jenkins/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> [Eclipse OpenJ9 Jenkins Builds](https://openj9-jenkins.osuosl.org/) diff --git a/buildenv/jenkins/common/build.groovy b/buildenv/jenkins/common/build.groovy index 447607f6379..01bbe3c517b 100644 --- a/buildenv/jenkins/common/build.groovy +++ b/buildenv/jenkins/common/build.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import groovy.json.JsonSlurper; import groovy.json.JsonOutput; diff --git a/buildenv/jenkins/common/pipeline-functions.groovy b/buildenv/jenkins/common/pipeline-functions.groovy index a4400aace9e..2ffbeee3daa 100644 --- a/buildenv/jenkins/common/pipeline-functions.groovy +++ b/buildenv/jenkins/common/pipeline-functions.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ def get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_TEST_REPOS_MAP=null, VENDOR_TEST_BRANCHES_MAP=null, VENDOR_TEST_SHAS_MAP=null) { diff --git a/buildenv/jenkins/common/variables-functions.groovy b/buildenv/jenkins/common/variables-functions.groovy index d35fa1ec9f9..183bfc6405f 100644 --- a/buildenv/jenkins/common/variables-functions.groovy +++ b/buildenv/jenkins/common/variables-functions.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/buildenv/jenkins/docker-nodes/README.md b/buildenv/jenkins/docker-nodes/README.md index 82cf99e7cb2..39d95b9f63b 100644 --- a/buildenv/jenkins/docker-nodes/README.md +++ b/buildenv/jenkins/docker-nodes/README.md @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Docker ## About diff --git a/buildenv/jenkins/docker-nodes/jenkinsfile-build-container.groovy b/buildenv/jenkins/docker-nodes/jenkinsfile-build-container.groovy index ef2a2f0b1b5..104f0206230 100644 --- a/buildenv/jenkins/docker-nodes/jenkinsfile-build-container.groovy +++ b/buildenv/jenkins/docker-nodes/jenkinsfile-build-container.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 * ******************************************************************************/ diff --git a/buildenv/jenkins/jobs/infrastructure/Cleanup-Nodes.groovy b/buildenv/jenkins/jobs/infrastructure/Cleanup-Nodes.groovy index 7378cf1c278..26c8a2dcf17 100644 --- a/buildenv/jenkins/jobs/infrastructure/Cleanup-Nodes.groovy +++ b/buildenv/jenkins/jobs/infrastructure/Cleanup-Nodes.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // #10071 This is a Jenkins class import hudson.slaves.OfflineCause diff --git a/buildenv/jenkins/jobs/infrastructure/Update-Reference-Repos.groovy b/buildenv/jenkins/jobs/infrastructure/Update-Reference-Repos.groovy index 75dcc1c926d..5ad9bbbc9bf 100644 --- a/buildenv/jenkins/jobs/infrastructure/Update-Reference-Repos.groovy +++ b/buildenv/jenkins/jobs/infrastructure/Update-Reference-Repos.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ SETUP_LABEL = params.SETUP_LABEL if (!SETUP_LABEL) { diff --git a/buildenv/jenkins/jobs/infrastructure/artifactoryCheck.groovy b/buildenv/jenkins/jobs/infrastructure/artifactoryCheck.groovy index 2254e3cfa68..26791c17591 100644 --- a/buildenv/jenkins/jobs/infrastructure/artifactoryCheck.groovy +++ b/buildenv/jenkins/jobs/infrastructure/artifactoryCheck.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ def LABEL = (params.LABEL) ?: "artifactory" def WARNING_THRESHOLD = (params.WARNING_THRESHOLD) ? params.WARNING.toInteger() : 75 diff --git a/buildenv/jenkins/jobs/infrastructure/artifactory_cleanup.groovy b/buildenv/jenkins/jobs/infrastructure/artifactory_cleanup.groovy index 659dd61eab0..df1a6d25dd4 100644 --- a/buildenv/jenkins/jobs/infrastructure/artifactory_cleanup.groovy +++ b/buildenv/jenkins/jobs/infrastructure/artifactory_cleanup.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/buildenv/jenkins/jobs/infrastructure/branchSplit.groovy b/buildenv/jenkins/jobs/infrastructure/branchSplit.groovy index f27449ba1de..21730697f0d 100644 --- a/buildenv/jenkins/jobs/infrastructure/branchSplit.groovy +++ b/buildenv/jenkins/jobs/infrastructure/branchSplit.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Assumes OPENJ9_SHA, OMR_SHA, and NEW_BRANCH_NAME are passed in Jenkins parameters diff --git a/buildenv/jenkins/jobs/infrastructure/buildJDKTimeoutHandler.groovy b/buildenv/jenkins/jobs/infrastructure/buildJDKTimeoutHandler.groovy index 03417c89815..c983004653e 100644 --- a/buildenv/jenkins/jobs/infrastructure/buildJDKTimeoutHandler.groovy +++ b/buildenv/jenkins/jobs/infrastructure/buildJDKTimeoutHandler.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ timestamps { diff --git a/buildenv/jenkins/jobs/infrastructure/lineEndingsCheck.groovy b/buildenv/jenkins/jobs/infrastructure/lineEndingsCheck.groovy index c42435b85bc..4d9ae0f89e6 100644 --- a/buildenv/jenkins/jobs/infrastructure/lineEndingsCheck.groovy +++ b/buildenv/jenkins/jobs/infrastructure/lineEndingsCheck.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ Boolean FAIL = false diff --git a/buildenv/jenkins/jobs/infrastructure/omrMirror.groovy b/buildenv/jenkins/jobs/infrastructure/omrMirror.groovy index 1daed725b96..9f2883bb933 100644 --- a/buildenv/jenkins/jobs/infrastructure/omrMirror.groovy +++ b/buildenv/jenkins/jobs/infrastructure/omrMirror.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ timestamps { diff --git a/buildenv/jenkins/jobs/infrastructure/promote_repo.groovy b/buildenv/jenkins/jobs/infrastructure/promote_repo.groovy index e19f8302873..66782e2146b 100644 --- a/buildenv/jenkins/jobs/infrastructure/promote_repo.groovy +++ b/buildenv/jenkins/jobs/infrastructure/promote_repo.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ properties([ diff --git a/buildenv/jenkins/jobs/infrastructure/signedOffByCheck.groovy b/buildenv/jenkins/jobs/infrastructure/signedOffByCheck.groovy index 7a224f2f067..eef77932bb2 100644 --- a/buildenv/jenkins/jobs/infrastructure/signedOffByCheck.groovy +++ b/buildenv/jenkins/jobs/infrastructure/signedOffByCheck.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ def FAIL = false diff --git a/buildenv/jenkins/jobs/infrastructure/tagRepos.groovy b/buildenv/jenkins/jobs/infrastructure/tagRepos.groovy index 4db7159f56a..38f66a059cd 100644 --- a/buildenv/jenkins/jobs/infrastructure/tagRepos.groovy +++ b/buildenv/jenkins/jobs/infrastructure/tagRepos.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // TAG_NAME and TAG_ANNOTATION are passed in Jenkins parameters (Mandatory) diff --git a/buildenv/jenkins/jobs/infrastructure/wrapper_job.groovy b/buildenv/jenkins/jobs/infrastructure/wrapper_job.groovy index c4548c7673a..222b153909b 100644 --- a/buildenv/jenkins/jobs/infrastructure/wrapper_job.groovy +++ b/buildenv/jenkins/jobs/infrastructure/wrapper_job.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ timeout(time: 6, unit: 'HOURS') { diff --git a/buildenv/jenkins/jobs/infrastructure/wrapper_template.groovy b/buildenv/jenkins/jobs/infrastructure/wrapper_template.groovy index f352ac2ddbd..462aa1c7c0e 100644 --- a/buildenv/jenkins/jobs/infrastructure/wrapper_template.groovy +++ b/buildenv/jenkins/jobs/infrastructure/wrapper_template.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/buildenv/jenkins/jobs/infrastructure/wrapper_variables.yml b/buildenv/jenkins/jobs/infrastructure/wrapper_variables.yml index 9f55eeb6c6b..bce3ee26d7c 100644 --- a/buildenv/jenkins/jobs/infrastructure/wrapper_variables.yml +++ b/buildenv/jenkins/jobs/infrastructure/wrapper_variables.yml @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #================================================================# diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy index 652ee83a76e..1dc36c9e65c 100644 --- a/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy +++ b/buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline-Initialize.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline-Initialize.groovy index 390162293d2..77b5647d456 100644 --- a/buildenv/jenkins/jobs/pipelines/Pipeline-Initialize.groovy +++ b/buildenv/jenkins/jobs/pipelines/Pipeline-Initialize.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ SETUP_LABEL = (params.SETUP_LABEL) ? params.SETUP_LABEL : 'worker' diff --git a/buildenv/jenkins/jobs/pipelines/Pipeline_Template.groovy b/buildenv/jenkins/jobs/pipelines/Pipeline_Template.groovy index d686e28a585..3c5c8b3db02 100644 --- a/buildenv/jenkins/jobs/pipelines/Pipeline_Template.groovy +++ b/buildenv/jenkins/jobs/pipelines/Pipeline_Template.groovy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/buildenv/jenkins/variables/admin_list.yml b/buildenv/jenkins/variables/admin_list.yml index ac7cdf65d91..565b00c0bed 100644 --- a/buildenv/jenkins/variables/admin_list.yml +++ b/buildenv/jenkins/variables/admin_list.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### openj9: - 0xdaryl diff --git a/buildenv/jenkins/variables/defaults.yml b/buildenv/jenkins/variables/defaults.yml index fad5a2a0fbd..b52fb1fbf43 100644 --- a/buildenv/jenkins/variables/defaults.yml +++ b/buildenv/jenkins/variables/defaults.yml @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #========================================# # Git repositories diff --git a/buildspecs/aix_ppc-64.spec b/buildspecs/aix_ppc-64.spec index 5682d4f5773..fbe8957a76e 100644 --- a/buildspecs/aix_ppc-64.spec +++ b/buildspecs/aix_ppc-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> AIX64 diff --git a/buildspecs/aix_ppc-64_cmprssptrs.spec b/buildspecs/aix_ppc-64_cmprssptrs.spec index 4247b90688e..0ff4fea272c 100644 --- a/buildspecs/aix_ppc-64_cmprssptrs.spec +++ b/buildspecs/aix_ppc-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> AIX64 Compressed Pointers diff --git a/buildspecs/aix_ppc.spec b/buildspecs/aix_ppc.spec index bd2b88a4ec0..5d70cd2813c 100644 --- a/buildspecs/aix_ppc.spec +++ b/buildspecs/aix_ppc.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> AIX diff --git a/buildspecs/cmprssptrs.feature b/buildspecs/cmprssptrs.feature index 0c876cebc42..276b3be38fa 100644 --- a/buildspecs/cmprssptrs.feature +++ b/buildspecs/cmprssptrs.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/combogc.feature b/buildspecs/combogc.feature index 70ddb1fe52f..424aaeb80ca 100644 --- a/buildspecs/combogc.feature +++ b/buildspecs/combogc.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/core.feature b/buildspecs/core.feature index 1a9136c65ad..019f6050bb7 100644 --- a/buildspecs/core.feature +++ b/buildspecs/core.feature @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/crypto.feature b/buildspecs/crypto.feature index 1f8209c1ea2..2d0c93b7a7c 100644 --- a/buildspecs/crypto.feature +++ b/buildspecs/crypto.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/dbgext.feature b/buildspecs/dbgext.feature index 53338931e8d..9ee686cce6b 100644 --- a/buildspecs/dbgext.feature +++ b/buildspecs/dbgext.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/gpu.feature b/buildspecs/gpu.feature index 3f27cb872ea..c1392447972 100644 --- a/buildspecs/gpu.feature +++ b/buildspecs/gpu.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/j9.build-info b/buildspecs/j9.build-info index 5a6022af7d9..6473b4c0475 100644 --- a/buildspecs/j9.build-info +++ b/buildspecs/j9.build-info @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags index c4dc825cdf0..740dfab836c 100644 --- a/buildspecs/j9.flags +++ b/buildspecs/j9.flags @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/linux_390-64.spec b/buildspecs/linux_390-64.spec index 67abd81771b..af93c7a147f 100644 --- a/buildspecs/linux_390-64.spec +++ b/buildspecs/linux_390-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux S390 64bit diff --git a/buildspecs/linux_390-64_cmprssptrs.spec b/buildspecs/linux_390-64_cmprssptrs.spec index b0d2b671777..f0bb1ee585c 100644 --- a/buildspecs/linux_390-64_cmprssptrs.spec +++ b/buildspecs/linux_390-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux S390 64bit Compressed Pointers diff --git a/buildspecs/linux_390.spec b/buildspecs/linux_390.spec index 94d25a0d299..cffce34ed7d 100644 --- a/buildspecs/linux_390.spec +++ b/buildspecs/linux_390.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux S390 diff --git a/buildspecs/linux_aarch64.spec b/buildspecs/linux_aarch64.spec index 4d7209b9f79..b7fe4187dba 100644 --- a/buildspecs/linux_aarch64.spec +++ b/buildspecs/linux_aarch64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux AArch64 diff --git a/buildspecs/linux_aarch64_cmprssptrs.spec b/buildspecs/linux_aarch64_cmprssptrs.spec index 32aaea10e3f..87ecd15bb04 100644 --- a/buildspecs/linux_aarch64_cmprssptrs.spec +++ b/buildspecs/linux_aarch64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux AArch64 Compressed Pointers diff --git a/buildspecs/linux_aarch64_cmprssptrs_cross.spec b/buildspecs/linux_aarch64_cmprssptrs_cross.spec index a5d00a6038d..095feb15ae5 100644 --- a/buildspecs/linux_aarch64_cmprssptrs_cross.spec +++ b/buildspecs/linux_aarch64_cmprssptrs_cross.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux AArch64 Compressed Pointers diff --git a/buildspecs/linux_aarch64_cross.spec b/buildspecs/linux_aarch64_cross.spec index 900cf3c381e..1ba01a8236e 100644 --- a/buildspecs/linux_aarch64_cross.spec +++ b/buildspecs/linux_aarch64_cross.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux AArch64 diff --git a/buildspecs/linux_arm.spec b/buildspecs/linux_arm.spec index 065172be660..feafae2ac89 100644 --- a/buildspecs/linux_arm.spec +++ b/buildspecs/linux_arm.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux ARM diff --git a/buildspecs/linux_arm_linaro.spec b/buildspecs/linux_arm_linaro.spec index 73ba241dd48..2e286e5108c 100644 --- a/buildspecs/linux_arm_linaro.spec +++ b/buildspecs/linux_arm_linaro.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux ARM diff --git a/buildspecs/linux_ppc-64.spec b/buildspecs/linux_ppc-64.spec index 86b9ecddb39..6035eeaf564 100644 --- a/buildspecs/linux_ppc-64.spec +++ b/buildspecs/linux_ppc-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux PPC 64bit diff --git a/buildspecs/linux_ppc-64_cmprssptrs.spec b/buildspecs/linux_ppc-64_cmprssptrs.spec index 77b19a3d8c4..504b0f71b2a 100644 --- a/buildspecs/linux_ppc-64_cmprssptrs.spec +++ b/buildspecs/linux_ppc-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux PPC 64bit Compressed Pointers diff --git a/buildspecs/linux_ppc-64_cmprssptrs_le.spec b/buildspecs/linux_ppc-64_cmprssptrs_le.spec index 227267558bf..829063c0f77 100644 --- a/buildspecs/linux_ppc-64_cmprssptrs_le.spec +++ b/buildspecs/linux_ppc-64_cmprssptrs_le.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux PPC LE 64bit Compressed Pointers diff --git a/buildspecs/linux_ppc-64_le.spec b/buildspecs/linux_ppc-64_le.spec index 871a3bbda4a..c2e790d7523 100644 --- a/buildspecs/linux_ppc-64_le.spec +++ b/buildspecs/linux_ppc-64_le.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux PPC LE 64bit diff --git a/buildspecs/linux_ppc.spec b/buildspecs/linux_ppc.spec index e47753a3db3..1d9206f1ae2 100644 --- a/buildspecs/linux_ppc.spec +++ b/buildspecs/linux_ppc.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux PPC diff --git a/buildspecs/linux_riscv64.spec b/buildspecs/linux_riscv64.spec index 2c6d3e21c0d..ac17219f9ea 100644 --- a/buildspecs/linux_riscv64.spec +++ b/buildspecs/linux_riscv64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux RISC-V 64bit diff --git a/buildspecs/linux_riscv64_cmprssptrs.spec b/buildspecs/linux_riscv64_cmprssptrs.spec index 5b5959ab0ee..831941cdcc3 100644 --- a/buildspecs/linux_riscv64_cmprssptrs.spec +++ b/buildspecs/linux_riscv64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux RISC-V 64bit Compressed Pointers diff --git a/buildspecs/linux_riscv64_cmprssptrs_cross.spec b/buildspecs/linux_riscv64_cmprssptrs_cross.spec index 0ef66c61209..f0ebb41fbfd 100644 --- a/buildspecs/linux_riscv64_cmprssptrs_cross.spec +++ b/buildspecs/linux_riscv64_cmprssptrs_cross.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux RISC-V 64bit Compressed Pointers diff --git a/buildspecs/linux_riscv64_cross.spec b/buildspecs/linux_riscv64_cross.spec index cea7b500957..0a10a421f6d 100644 --- a/buildspecs/linux_riscv64_cross.spec +++ b/buildspecs/linux_riscv64_cross.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux RISC-V 64bit diff --git a/buildspecs/linux_x86-64.spec b/buildspecs/linux_x86-64.spec index f4fd549055e..0a79f6beec0 100644 --- a/buildspecs/linux_x86-64.spec +++ b/buildspecs/linux_x86-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux Hammer diff --git a/buildspecs/linux_x86-64_cmprssptrs.spec b/buildspecs/linux_x86-64_cmprssptrs.spec index fe093a7aba4..0449497c261 100644 --- a/buildspecs/linux_x86-64_cmprssptrs.spec +++ b/buildspecs/linux_x86-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux Hammer Compressed Pointers diff --git a/buildspecs/linux_x86.spec b/buildspecs/linux_x86.spec index 9836b8a8854..d2d9eb0be80 100644 --- a/buildspecs/linux_x86.spec +++ b/buildspecs/linux_x86.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Linux IA32 diff --git a/buildspecs/linux_ztpf_390-64.spec b/buildspecs/linux_ztpf_390-64.spec index 931f2b85a74..4d35220d98e 100644 --- a/buildspecs/linux_ztpf_390-64.spec +++ b/buildspecs/linux_ztpf_390-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ZTPF S390 64bit Builder diff --git a/buildspecs/osx_x86-64.spec b/buildspecs/osx_x86-64.spec index e5b75264a9f..effd054d46f 100644 --- a/buildspecs/osx_x86-64.spec +++ b/buildspecs/osx_x86-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> OSX diff --git a/buildspecs/osx_x86-64_cmprssptrs.spec b/buildspecs/osx_x86-64_cmprssptrs.spec index 9193aca9553..82ea9bf3abc 100644 --- a/buildspecs/osx_x86-64_cmprssptrs.spec +++ b/buildspecs/osx_x86-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> OSX Compressed Pointers diff --git a/buildspecs/se.feature b/buildspecs/se.feature index 10b233f3050..447e19044bf 100644 --- a/buildspecs/se.feature +++ b/buildspecs/se.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/se60_26.feature b/buildspecs/se60_26.feature index 51fad81af38..9e00c3475e3 100644 --- a/buildspecs/se60_26.feature +++ b/buildspecs/se60_26.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/se7.feature b/buildspecs/se7.feature index 560fb69b46c..14e888f4710 100644 --- a/buildspecs/se7.feature +++ b/buildspecs/se7.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/se70_27.feature b/buildspecs/se70_27.feature index a5faf866e95..5b3e3a12a66 100644 --- a/buildspecs/se70_27.feature +++ b/buildspecs/se70_27.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/se7raw.feature b/buildspecs/se7raw.feature index 17ece540fee..aa948e677b2 100644 --- a/buildspecs/se7raw.feature +++ b/buildspecs/se7raw.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/se8.feature b/buildspecs/se8.feature index 31b2600075e..5dc39e262b8 100644 --- a/buildspecs/se8.feature +++ b/buildspecs/se8.feature @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/buildspecs/win_x86-64.spec b/buildspecs/win_x86-64.spec index 3393d44484d..15847ce88d6 100644 --- a/buildspecs/win_x86-64.spec +++ b/buildspecs/win_x86-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Win64 Hammer diff --git a/buildspecs/win_x86-64_cmprssptrs.spec b/buildspecs/win_x86-64_cmprssptrs.spec index 6b8cea3b4f2..69ba7db2139 100644 --- a/buildspecs/win_x86-64_cmprssptrs.spec +++ b/buildspecs/win_x86-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Win64 Hammer Compressed Pointers diff --git a/buildspecs/win_x86.spec b/buildspecs/win_x86.spec index 72438a1ae69..7f577b86bb0 100644 --- a/buildspecs/win_x86.spec +++ b/buildspecs/win_x86.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Windows IA32 diff --git a/buildspecs/zos_390-64.spec b/buildspecs/zos_390-64.spec index c221758c480..ed22b813e0d 100644 --- a/buildspecs/zos_390-64.spec +++ b/buildspecs/zos_390-64.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> zOS S390 64bit diff --git a/buildspecs/zos_390-64_cmprssptrs.spec b/buildspecs/zos_390-64_cmprssptrs.spec index 384b60c16ab..94938b6db7d 100644 --- a/buildspecs/zos_390-64_cmprssptrs.spec +++ b/buildspecs/zos_390-64_cmprssptrs.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> zOS S390 64bit Compressed Pointers diff --git a/buildspecs/zos_390.spec b/buildspecs/zos_390.spec index e2c7c5cb45b..9c1e18e5d5f 100644 --- a/buildspecs/zos_390.spec +++ b/buildspecs/zos_390.spec @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> zOS S390 diff --git a/cdsadapter/README.md b/cdsadapter/README.md index 9f3a804bd3b..f545449af1c 100644 --- a/cdsadapter/README.md +++ b/cdsadapter/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Documentation diff --git a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleEntry.java b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleEntry.java index 05c93b74460..b3ff4c3da6d 100644 --- a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleEntry.java +++ b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleEntry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cds; diff --git a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleFile.java b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleFile.java index a86fcc85d37..abbad778e0e 100644 --- a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleFile.java +++ b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSBundleFile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cds; diff --git a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookConfigurator.java b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookConfigurator.java index 7b8e9e3bf1f..65726238676 100644 --- a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookConfigurator.java +++ b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookConfigurator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cds; diff --git a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookImpls.java b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookImpls.java index 2a195a15c10..b92c24ad47b 100644 --- a/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookImpls.java +++ b/cdsadapter/com.ibm.cds/src/com/ibm/cds/CDSHookImpls.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cds; diff --git a/debugtools/DDR_Autoblob/.gitignore b/debugtools/DDR_Autoblob/.gitignore index ad3126a00a0..609ed1773dd 100644 --- a/debugtools/DDR_Autoblob/.gitignore +++ b/debugtools/DDR_Autoblob/.gitignore @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /bin/ diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/CTypeParser.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/CTypeParser.java index c2b077ab0e0..2cbd8ff135e 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/CTypeParser.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/CTypeParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/ExtractCPPFlags.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/ExtractCPPFlags.java index ea7b539e6da..21dd2173ac1 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/ExtractCPPFlags.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/ExtractCPPFlags.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateBlobC.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateBlobC.java index 97f2be13f56..b39d82e39c7 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateBlobC.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateBlobC.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateInputCFile.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateInputCFile.java index 74a68f781c3..7c27fa8d297 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateInputCFile.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateInputCFile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateSpecSuperset.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateSpecSuperset.java index 37d8a1d16f3..53fb10a17e0 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateSpecSuperset.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GenerateSpecSuperset.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GetNativeDirectory.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GetNativeDirectory.java index 2fb8a585d59..3963bdd4969 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GetNativeDirectory.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/GetNativeDirectory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/SortHeadersInConfig.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/SortHeadersInConfig.java index 5ec86159d56..c64812b33c3 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/SortHeadersInConfig.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/SortHeadersInConfig.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/StripGarbage.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/StripGarbage.java index 468feea2ae7..31dbcc913e6 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/StripGarbage.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/StripGarbage.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/BlobHeader.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/BlobHeader.java index 1005615ad6f..974c684f144 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/BlobHeader.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/BlobHeader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.config; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/Configuration.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/Configuration.java index ca4e2cf0149..cc2c3555159 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/Configuration.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/Configuration.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.config; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/ConstantHandlingStrategy.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/ConstantHandlingStrategy.java index 2241f119be9..153ec6207b4 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/ConstantHandlingStrategy.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/config/ConstantHandlingStrategy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.config; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ConstantParser.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ConstantParser.java index fecd07b2150..b095cfcd679 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ConstantParser.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ConstantParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.constants; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ICVisitor.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ICVisitor.java index a14e802e4f2..c1fcd50032e 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ICVisitor.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/constants/ICVisitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.constants; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ClassType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ClassType.java index f332deb682c..938d0fcd915 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ClassType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ClassType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Constant.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Constant.java index 21a02610c35..f355905f013 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Constant.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Constant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ConstantsType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ConstantsType.java index 9da17c3bc71..ab50e5c81d0 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ConstantsType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ConstantsType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Declaration.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Declaration.java index 86c9a20c449..8f89b984269 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Declaration.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Declaration.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumType.java index c224398ab55..958916a8e8b 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumerationConstant.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumerationConstant.java index 97e2a1b5545..e2f7ec05b78 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumerationConstant.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/EnumerationConstant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ITypeCollection.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ITypeCollection.java index 732a532f7e7..1dbe27c2de3 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ITypeCollection.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/ITypeCollection.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/PseudoType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/PseudoType.java index 23ff95ae8bc..09bf400bf52 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/PseudoType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/PseudoType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/RecordType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/RecordType.java index a2cd5ceed73..addcf3b9a6d 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/RecordType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/RecordType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/StructType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/StructType.java index caaf9c6b295..e716d622ca9 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/StructType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/StructType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Type.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Type.java index f84cda2e3d8..3cff91270e3 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Type.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Type.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Typedef.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Typedef.java index 76a25f3cb03..c27a0dd3b78 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Typedef.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/Typedef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UnionType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UnionType.java index f922e5cde46..a370775730f 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UnionType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UnionType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UserDefinedType.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UserDefinedType.java index 8d03bdfb27a..e7f9c416ed4 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UserDefinedType.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/datamodel/UserDefinedType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.datamodel; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/IHeaderResolver.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/IHeaderResolver.java index 0144e0083f6..a0e9cd70a4b 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/IHeaderResolver.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/IHeaderResolver.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.linenumbers; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/ILineNumberConverter.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/ILineNumberConverter.java index 14ae739e145..c2ce87df88c 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/ILineNumberConverter.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/ILineNumberConverter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.linenumbers; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/PreProcessedSourceParser.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/PreProcessedSourceParser.java index c45946485ab..2a04145f793 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/PreProcessedSourceParser.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/PreProcessedSourceParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.linenumbers; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/SourceLocation.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/SourceLocation.java index 6877c4cf4cf..fd91e071374 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/SourceLocation.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/linenumbers/SourceLocation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.linenumbers; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/J9FlagsXMLParser.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/J9FlagsXMLParser.java index 16eb98d7b2c..dbb9ffbc507 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/J9FlagsXMLParser.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/J9FlagsXMLParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.xmlparser; diff --git a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/StructureXMLParser.java b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/StructureXMLParser.java index 1cf2667afeb..aab39b66f1c 100644 --- a/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/StructureXMLParser.java +++ b/debugtools/DDR_Autoblob/src/com/ibm/j9ddr/autoblob/xmlparser/StructureXMLParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.autoblob.xmlparser; diff --git a/debugtools/DDR_Autoblob/testsrc/TestConstantParser.java b/debugtools/DDR_Autoblob/testsrc/TestConstantParser.java index c1f8ccf48a1..98cc9ea169a 100644 --- a/debugtools/DDR_Autoblob/testsrc/TestConstantParser.java +++ b/debugtools/DDR_Autoblob/testsrc/TestConstantParser.java @@ -23,7 +23,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/debugtools/DDR_Autoblob/testsrc/TestPreProcessedSource.java b/debugtools/DDR_Autoblob/testsrc/TestPreProcessedSource.java index 1438cd88952..b1732e9d68d 100644 --- a/debugtools/DDR_Autoblob/testsrc/TestPreProcessedSource.java +++ b/debugtools/DDR_Autoblob/testsrc/TestPreProcessedSource.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/debugtools/DDR_VM/.gitignore b/debugtools/DDR_VM/.gitignore index 23398fa65fc..6ba0be13ca8 100644 --- a/debugtools/DDR_VM/.gitignore +++ b/debugtools/DDR_VM/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /bin/ diff --git a/debugtools/DDR_VM/binary_operation_investigation/arith_template.hpp b/debugtools/DDR_VM/binary_operation_investigation/arith_template.hpp index 665a41bb1e7..88d16e066b7 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/arith_template.hpp +++ b/debugtools/DDR_VM/binary_operation_investigation/arith_template.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/debugtools/DDR_VM/binary_operation_investigation/generate_test_suite.pl b/debugtools/DDR_VM/binary_operation_investigation/generate_test_suite.pl index 151d79ea729..f8847dcea32 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/generate_test_suite.pl +++ b/debugtools/DDR_VM/binary_operation_investigation/generate_test_suite.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Script to build a C testcase for generating test cases for scalar types diff --git a/debugtools/DDR_VM/binary_operation_investigation/j9_types.hpp b/debugtools/DDR_VM/binary_operation_investigation/j9_types.hpp index 006b32834b0..9762d13247f 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/j9_types.hpp +++ b/debugtools/DDR_VM/binary_operation_investigation/j9_types.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/debugtools/DDR_VM/binary_operation_investigation/prettify_type_conversion_explorer_output.pl b/debugtools/DDR_VM/binary_operation_investigation/prettify_type_conversion_explorer_output.pl index ad3e5b91824..c78a0dd3be4 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/prettify_type_conversion_explorer_output.pl +++ b/debugtools/DDR_VM/binary_operation_investigation/prettify_type_conversion_explorer_output.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Script to build an HTML table from the output of type_conversion_explorer. # diff --git a/debugtools/DDR_VM/binary_operation_investigation/process_test_suite_output.pl b/debugtools/DDR_VM/binary_operation_investigation/process_test_suite_output.pl index e515b15966c..aad17760c6a 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/process_test_suite_output.pl +++ b/debugtools/DDR_VM/binary_operation_investigation/process_test_suite_output.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Takes the output of the CPP program generated by generate_test_suite.pl # and turns it into Java code to be pasted into com.ibm.j9ddr.unittests.core.ScalarTest diff --git a/debugtools/DDR_VM/binary_operation_investigation/test_suite.cpp b/debugtools/DDR_VM/binary_operation_investigation/test_suite.cpp index cc10eed7b42..3a389c0fb1d 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/test_suite.cpp +++ b/debugtools/DDR_VM/binary_operation_investigation/test_suite.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Automatically generated by generate_test_suit.pl. */ diff --git a/debugtools/DDR_VM/binary_operation_investigation/type_conversion_explorer.cpp b/debugtools/DDR_VM/binary_operation_investigation/type_conversion_explorer.cpp index b52d6cb61ff..ead42bd2cd5 100644 --- a/debugtools/DDR_VM/binary_operation_investigation/type_conversion_explorer.cpp +++ b/debugtools/DDR_VM/binary_operation_investigation/type_conversion_explorer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Application for experimentally determining type conversions from diff --git a/debugtools/DDR_VM/data/superset-constants.dat b/debugtools/DDR_VM/data/superset-constants.dat index b904b68cd3b..baba4092575 100644 --- a/debugtools/DDR_VM/data/superset-constants.dat +++ b/debugtools/DDR_VM/data/superset-constants.dat @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file lists constants that have always been available. It is safe to use them # in hand-written DDR_VM Java source code. If a constant ceases to be defined in any diff --git a/debugtools/DDR_VM/data/xpath configs/DTFJHeapSectionUnitTest.properties b/debugtools/DDR_VM/data/xpath configs/DTFJHeapSectionUnitTest.properties index d6561627573..9f97f582257 100644 --- a/debugtools/DDR_VM/data/xpath configs/DTFJHeapSectionUnitTest.properties +++ b/debugtools/DDR_VM/data/xpath configs/DTFJHeapSectionUnitTest.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### Sections=/heaps/heap/section diff --git a/debugtools/DDR_VM/data/xpath configs/DTFJHeapUnitTest.properties b/debugtools/DDR_VM/data/xpath configs/DTFJHeapUnitTest.properties index 7b29a3c4493..c2ef6dfcf0d 100644 --- a/debugtools/DDR_VM/data/xpath configs/DTFJHeapUnitTest.properties +++ b/debugtools/DDR_VM/data/xpath configs/DTFJHeapUnitTest.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HeapName=/heaps/heap diff --git a/debugtools/DDR_VM/generate-ddr.xml b/debugtools/DDR_VM/generate-ddr.xml index 2ae6ba758a1..1fe9d500163 100644 --- a/debugtools/DDR_VM/generate-ddr.xml +++ b/debugtools/DDR_VM/generate-ddr.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/debugtools/DDR_VM/generate.properties b/debugtools/DDR_VM/generate.properties index 77d87418fb6..66d79339d8e 100644 --- a/debugtools/DDR_VM/generate.properties +++ b/debugtools/DDR_VM/generate.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Properties file to control the generation of stubs / pointers. diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/AddressedCorruptDataException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/AddressedCorruptDataException.java index 4e748475422..7a06f59b3e8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/AddressedCorruptDataException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/AddressedCorruptDataException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/AuxFieldInfo29.dat b/debugtools/DDR_VM/src/com/ibm/j9ddr/AuxFieldInfo29.dat index 47a14f75a58..a22d539c15c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/AuxFieldInfo29.dat +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/AuxFieldInfo29.dat @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/BytecodeGenerator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/BytecodeGenerator.java index 8ea2b21be83..e34c6308393 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/BytecodeGenerator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/BytecodeGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/CTypeParser.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/CTypeParser.java index 27f33d07a3b..f08acfdade0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/CTypeParser.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/CTypeParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat b/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat index 71c5a210ed4..1aa190e1fb2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/CompatibilityConstants29.dat @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/CorruptDataException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/CorruptDataException.java index 15bd7db219a..9f388552438 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/CorruptDataException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/CorruptDataException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/DDRSymbolFinder.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/DDRSymbolFinder.java index 877ff600d15..43bf3011590 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/DDRSymbolFinder.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/DDRSymbolFinder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/DataUnavailableException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/DataUnavailableException.java index fb445f7faed..722b1d50a2b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/DataUnavailableException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/DataUnavailableException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedFieldAccessor.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedFieldAccessor.java index 14ac9c36372..524304efe93 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedFieldAccessor.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedFieldAccessor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedPointerClass.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedPointerClass.java index c6aed84e594..f644be483a3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedPointerClass.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/GeneratedPointerClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/IBootstrapRunnable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/IBootstrapRunnable.java index 86d27aa1e31..1b44ffe7876 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/IBootstrapRunnable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/IBootstrapRunnable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/IVMData.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/IVMData.java index 1ee9a1fbf21..1922e4b08df 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/IVMData.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/IVMData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/InvalidDataTypeException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/InvalidDataTypeException.java index c2563abb053..623c0922f05 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/InvalidDataTypeException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/InvalidDataTypeException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/J9DDRClassLoader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/J9DDRClassLoader.java index 2857c812bfa..5fe4e4aa939 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/J9DDRClassLoader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/J9DDRClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/NoSuchFieldException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/NoSuchFieldException.java index 67553cb1035..150dc1b1def 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/NoSuchFieldException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/NoSuchFieldException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/NullPointerDereference.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/NullPointerDereference.java index feb82c82480..0522b55d71b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/NullPointerDereference.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/NullPointerDereference.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29-edg.dat b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29-edg.dat index 4faf9575a55..d56b0ef06b9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29-edg.dat +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29-edg.dat @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* All VM code assumes that sizeof(char) = 1 */ diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29.dat b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29.dat index eca2de01a3b..04dee21a115 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29.dat +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureAliases29.dat @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureHeader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureHeader.java index 52f5e1b32b6..9bdd915ed3d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureHeader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureHeader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureReader.java index 8a5a1b64775..ab41ca6d254 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureTypeManager.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureTypeManager.java index d68078622be..1c0f01e5341 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureTypeManager.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/StructureTypeManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/VMDataFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/VMDataFactory.java index 8d181748060..ee1efd6365d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/VMDataFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/VMDataFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/BlobFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/BlobFactory.java index baaaa434652..ee599bf2ecf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/BlobFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/BlobFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.blobs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/IBlobFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/IBlobFactory.java index 4b4712f90b8..9f34afa5d69 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/IBlobFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/blobs/IBlobFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.blobs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandParser.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandParser.java index 064104cf27e..f904a665f0f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandParser.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.command; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandReader.java index eb829a68b34..98ec7a01985 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/CommandReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.command; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ConsoleCommandReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ConsoleCommandReader.java index 91a7311ce5c..f52992a9cbf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ConsoleCommandReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ConsoleCommandReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.command; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ExitException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ExitException.java index 3e1d12cfb77..ab5d5813578 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ExitException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/command/ExitException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.command; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/AbstractCoreReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/AbstractCoreReader.java index c610c26cd91..539b6372072 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/AbstractCoreReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/AbstractCoreReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ClosingFileReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ClosingFileReader.java index 64749519d5a..10a11998309 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ClosingFileReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ClosingFileReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CoreReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CoreReader.java index b6bdec56f36..b43537587f8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CoreReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CoreReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CorruptCoreException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CorruptCoreException.java index c582a5947f9..fcabcdb56f1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CorruptCoreException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/CorruptCoreException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/DumpException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/DumpException.java index 7e0c23569d4..ecb12a10159 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/DumpException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/DumpException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICore.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICore.java index 16269b15faa..ab102174189 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICore.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICoreFileReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICoreFileReader.java index 209fc7f5798..22348f2728e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICoreFileReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ICoreFileReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryDependentCore.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryDependentCore.java index 91dc7cf828b..e31e7fd10f4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryDependentCore.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryDependentCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryResolver.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryResolver.java index d172ded95d6..5ee38133238 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryResolver.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ILibraryResolver.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/IModuleFile.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/IModuleFile.java index 0a9e7148c22..3a579dd053b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/IModuleFile.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/IModuleFile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/InvalidDumpFormatException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/InvalidDumpFormatException.java index 0c9f2e78639..63b676557d2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/InvalidDumpFormatException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/InvalidDumpFormatException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryDataSource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryDataSource.java index 10fc04304b2..ef449981211 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryDataSource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryDataSource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryResolverFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryResolverFactory.java index 3a255ca8759..b0ee4fe35a4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryResolverFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/LibraryResolverFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/Platform.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/Platform.java index c34fe7fc868..97fac65c993 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/Platform.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/Platform.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ZipFileResolver.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ZipFileResolver.java index ee1e6a5d5cc..8eab80712b3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ZipFileResolver.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/ZipFileResolver.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX32DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX32DumpReader.java index a6c88c888aa..4de6b497c10 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX32DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX32DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX64DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX64DumpReader.java index 5cb7b73516a..39e01d23fef 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX64DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIX64DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReader.java index bf793044a0e..e4fe554f32b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReaderFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReaderFactory.java index 2fa76bd4af3..a0ca9fbbbd8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReaderFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXDumpReaderFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXProcessAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXProcessAddressSpace.java index 31b4742ef7e..ff50f622e2f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXProcessAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/AIXProcessAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/ARReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/ARReader.java index d2e9a35ad0f..0a7402634f9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/ARReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/ARReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/BaseAIXOSThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/BaseAIXOSThread.java index aaa8220d6a0..9d64b15a3a2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/BaseAIXOSThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/BaseAIXOSThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/XCOFFReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/XCOFFReader.java index 2dcc3e1c0a0..3fedf280103 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/XCOFFReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/aix/XCOFFReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.aix; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address.java index 6bde69539e9..085d0869fc1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address32.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address32.java index 4b90d7888a9..2a14aea41db 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address32.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address32.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address64.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address64.java index d3ea53155c7..e2793f232fb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address64.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/Address64.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/DataEntry.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/DataEntry.java index 1dcc3d23871..6e1ad241e3d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/DataEntry.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/DataEntry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF32FileReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF32FileReader.java index b0231ed45af..e0258074e60 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF32FileReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF32FileReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF64FileReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF64FileReader.java index 37c088513c8..6bc07c60412 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF64FileReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELF64FileReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAArch64DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAArch64DumpReader.java index c6aa2fbaf30..28cb41ce30d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAArch64DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAArch64DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAMD64DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAMD64DumpReader.java index 9d546eec6dc..3a9ec812a79 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAMD64DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFAMD64DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFARM32DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFARM32DumpReader.java index 6fc36ed76bd..77e08deceb2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFARM32DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFARM32DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReader.java index 1be125c2363..4754c2c32c1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReaderFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReaderFactory.java index e7fb504fe98..2d655008126 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReaderFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFDumpReaderFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFFileReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFFileReader.java index effac2df5e5..8937d91c9f3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFFileReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFFileReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFIA32DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFIA32DumpReader.java index 749efd33d9c..1dcb8cb8303 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFIA32DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFIA32DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFMemorySource.java index 699515602a3..4a76de958f1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC32DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC32DumpReader.java index 5d469eae942..2b675bb60d0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC32DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC32DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC64DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC64DumpReader.java index 148e2851a74..e14e76fdd33 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC64DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFPPC64DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFRISCV64DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFRISCV64DumpReader.java index 60d569d8129..3ae9e446853 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFRISCV64DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFRISCV64DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39031DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39031DumpReader.java index 75a1f9c5770..7c6f31f6c25 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39031DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39031DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39064DumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39064DumpReader.java index b104fd1ec03..195d4876b19 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39064DumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFS39064DumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFSymbol.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFSymbol.java index 3a4e4e11fba..52b2cde71a5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFSymbol.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ELFSymbol.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/LinuxProcessAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/LinuxProcessAddressSpace.java index 32bdaf85f9a..ded35fb91dc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/LinuxProcessAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/LinuxProcessAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ProgramHeaderEntry.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ProgramHeaderEntry.java index 2b8085a1746..d621e557d39 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ProgramHeaderEntry.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/ProgramHeaderEntry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/SectionHeaderEntry.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/SectionHeaderEntry.java index b72932d3fd3..e966c371e64 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/SectionHeaderEntry.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/SectionHeaderEntry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/CIE.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/CIE.java index fcf7af34d15..88c27285e30 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/CIE.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/CIE.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/FDE.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/FDE.java index 441abcdea07..8428dfc64d3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/FDE.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/FDE.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/Unwind.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/Unwind.java index baf9fbb4f90..4f682bed690 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/Unwind.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/Unwind.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/UnwindTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/UnwindTable.java index 29c47a3a8bc..0b8d4ba50f6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/UnwindTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/elf/unwind/UnwindTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.elf.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/BuildVersionCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/BuildVersionCommand.java index 77a63bdea0e..35b1d167bef 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/BuildVersionCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/BuildVersionCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DSymtabCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DSymtabCommand.java index f28650eb250..9dc9638461c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DSymtabCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DSymtabCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DyldInfoCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DyldInfoCommand.java index c641065e37c..ff947c757cf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DyldInfoCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DyldInfoCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylibCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylibCommand.java index 0d9416782ad..d9f2b57aa32 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylibCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylibCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylinkerCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylinkerCommand.java index d7e264f2b74..b0e7439d232 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylinkerCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/DylinkerCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EncryptionCommand64.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EncryptionCommand64.java index 8b095b278d1..5d2f671284c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EncryptionCommand64.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EncryptionCommand64.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EntryPointCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EntryPointCommand.java index a4f6d806090..7250d65aebf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EntryPointCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/EntryPointCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkeditDataCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkeditDataCommand.java index 3da840ede65..dd452ebb241 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkeditDataCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkeditDataCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkerOptionCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkerOptionCommand.java index 0d08a7c68ef..e0def81619f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkerOptionCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LinkerOptionCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LoadCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LoadCommand.java index 9537fe9d654..447711f0c59 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LoadCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/LoadCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReader.java index 1a2aed3cac4..42aa1f42d35 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReaderFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReaderFactory.java index 4acf7d50a31..eccceeab184 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReaderFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/MachoDumpReaderFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.macho; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/NoteCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/NoteCommand.java index 706ff187997..c58530323a1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/NoteCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/NoteCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/OSXProcessAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/OSXProcessAddressSpace.java index ef8d53582dc..3c6754420d8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/OSXProcessAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/OSXProcessAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PrebindChecksumCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PrebindChecksumCommand.java index 279809ae443..3f74987574c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PrebindChecksumCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PrebindChecksumCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PreboundDylibCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PreboundDylibCommand.java index 16f48037762..1c8c8780fcf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PreboundDylibCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/PreboundDylibCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RoutinesCommand64.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RoutinesCommand64.java index 2390e06a994..d3cedd8f3f6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RoutinesCommand64.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RoutinesCommand64.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RpathCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RpathCommand.java index 9dd72950738..1f1f41affc8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RpathCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/RpathCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SegmentCommand64.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SegmentCommand64.java index f4236602ea7..10e44f17a53 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SegmentCommand64.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SegmentCommand64.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SourceVersionCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SourceVersionCommand.java index 8e9c4d6fb3c..3602b879bea 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SourceVersionCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SourceVersionCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SubCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SubCommand.java index dfae4f4c509..e69132c3867 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SubCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SubCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SymtabCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SymtabCommand.java index f79087597c4..75937e4c3a9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SymtabCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/SymtabCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/ThreadCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/ThreadCommand.java index d1b338c5fce..f36d91add88 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/ThreadCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/ThreadCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/TwoLevelHintsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/TwoLevelHintsCommand.java index 9f030f345e3..ae48df0ca3c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/TwoLevelHintsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/TwoLevelHintsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/UuidCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/UuidCommand.java index a789b935144..22156e5b51f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/UuidCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/UuidCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/VersionMinCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/VersionMinCommand.java index 4b7bd9fb6e5..9aeaaf269d0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/VersionMinCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/macho/VersionMinCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************************************* * Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/AbstractMemory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/AbstractMemory.java index 4db69369c2c..09548619287 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/AbstractMemory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/AbstractMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Addresses.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Addresses.java index d236ea929cb..80c78657b91 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Addresses.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Addresses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseMemoryRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseMemoryRange.java index 3c599e622ec..13f437f196b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseMemoryRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseModule.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseModule.java index c51811afc26..b898bb4341c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseModule.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BaseModule.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemory.java index 039363e6196..5c4f67a8e22 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemorySource.java index 7f44aee44f1..feb9bb765df 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/BufferedMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DelegatingMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DelegatingMemorySource.java index 095c1c553c0..5d1eff3c81d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DelegatingMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DelegatingMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DetailedDumpMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DetailedDumpMemorySource.java index 51fbe456659..e03f0a47c1f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DetailedDumpMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DetailedDumpMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DumpMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DumpMemorySource.java index bbb8531b32e..65b6b219d05 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DumpMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/DumpMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/EnvironmentUtils.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/EnvironmentUtils.java index 18f044efc23..8bcdb0518c6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/EnvironmentUtils.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/EnvironmentUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IAddressSpace.java index fb512c979a0..ac62e1f7ec8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IDetailedMemoryRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IDetailedMemoryRange.java index b1ea952b75d..59b2d7e3032 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IDetailedMemoryRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IDetailedMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemory.java index e18f8c79021..a5e69986125 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryImageInputStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryImageInputStream.java index 4022bc59529..92860be1cf9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryImageInputStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryImageInputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryRange.java index fd4f9f33f1d..7c967d7d85e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemorySource.java index 9b932c29c11..2b21b978348 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IModule.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IModule.java index 2f6bc0058cc..74171c4cea6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IModule.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IModule.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/INamedMemoryRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/INamedMemoryRange.java index 011ebeba51d..41e8fe933d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/INamedMemoryRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/INamedMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IProcess.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IProcess.java index fb3a75ac34a..ebde6b07af3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IProcess.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/IProcess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ISymbol.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ISymbol.java index d938803e063..d5f667b940f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ISymbol.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ISymbol.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryFault.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryFault.java index 451f9782dde..fc6e8fb7bb9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryFault.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryFault.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryRange.java index 6b5917cf670..a64ae525309 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemorySourceTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemorySourceTable.java index be34defc3a1..13cc9f2fff7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemorySourceTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MemorySourceTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MissingFileModule.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MissingFileModule.java index d4a262949b8..360fd56ed51 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MissingFileModule.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/MissingFileModule.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Module.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Module.java index a38e46aa28d..06155636ff1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Module.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Module.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProcessAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProcessAddressSpace.java index 5685f5ab7be..f0d5c18e559 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProcessAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProcessAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProtectedMemoryRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProtectedMemoryRange.java index 97addf95021..25b5a64d7b7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProtectedMemoryRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/ProtectedMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SearchableMemory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SearchableMemory.java index 2466e7ebc02..5d6f422ac68 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SearchableMemory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SearchableMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Symbol.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Symbol.java index bbbf58fea88..dac68e1c643 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Symbol.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/Symbol.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SymbolUtil.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SymbolUtil.java index f5dfbdeea74..353244b9fc5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SymbolUtil.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/SymbolUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/UnbackedMemorySource.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/UnbackedMemorySource.java index 525e1e11221..3d7c472712b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/UnbackedMemorySource.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/memory/UnbackedMemorySource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/BaseWindowsOSThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/BaseWindowsOSThread.java index 74d691555e9..4ae7be97409 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/BaseWindowsOSThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/BaseWindowsOSThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/EarlyInitializedStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/EarlyInitializedStream.java index 52600d535a8..12f1fa2ec22 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/EarlyInitializedStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/EarlyInitializedStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/LateInitializedStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/LateInitializedStream.java index 250851ed6ab..705368893d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/LateInitializedStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/LateInitializedStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Memory64Stream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Memory64Stream.java index 9fde7828557..da374c31a83 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Memory64Stream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Memory64Stream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MemoryInfoStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MemoryInfoStream.java index 6deba60a47d..fc65a321f54 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MemoryInfoStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MemoryInfoStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiniDumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiniDumpReader.java index ab11e6ffa57..341c6f6b627 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiniDumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiniDumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiscInfoStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiscInfoStream.java index 6a021ff3a71..98e99ab159c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiscInfoStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/MiscInfoStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ModuleStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ModuleStream.java index 20b34a91e32..6f9917e5236 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ModuleStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ModuleStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Stream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Stream.java index 87bd0cfcd82..cf176c700af 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Stream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/Stream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/SystemInfoStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/SystemInfoStream.java index 1e80baef9f1..1ab759bf9b3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/SystemInfoStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/SystemInfoStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadInfoStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadInfoStream.java index f1222b6e250..fa90ed04e24 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadInfoStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadInfoStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadStream.java index 545714ccbc5..e37ed49ce88 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/ThreadStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/WindowsProcessAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/WindowsProcessAddressSpace.java index 4d22de42bed..8aad2ad5e8a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/WindowsProcessAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/WindowsProcessAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/RuntimeFunction.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/RuntimeFunction.java index b952ce745f9..24103a3e270 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/RuntimeFunction.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/RuntimeFunction.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindCode.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindCode.java index ab7abc230e7..0a9c9d4910d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindCode.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindCode.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindInfo.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindInfo.java index 4932a9cfd76..e75b8244d24 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindInfo.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindModule.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindModule.java index 9acab5f5d6c..b73627c8d2a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindModule.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/minidump/unwind/UnwindModule.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.minidump.unwind; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSStackFrame.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSStackFrame.java index 80b6b3963ad..e892e11a6cd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSStackFrame.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSStackFrame.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.osthread; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSThread.java index c4ac0241cf6..2ced5efed85 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IOSThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.osthread; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IRegister.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IRegister.java index e56ed182bdf..141669d832b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IRegister.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/IRegister.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.osthread; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/OSStackFrame.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/OSStackFrame.java index a9663ee5d03..ce643707057 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/OSStackFrame.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/OSStackFrame.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.osthread; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/Register.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/Register.java index 1049111365b..d66c4102c71 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/Register.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/osthread/Register.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.osthread; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/TDumpReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/TDumpReader.java index f40e163db45..22bd399dfd0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/TDumpReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/TDumpReader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressRange.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressRange.java index e75387e4a37..2ee635605b5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressRange.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpace.java index 59c534c7064..84ca9f0f5d3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpaceImageInputStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpaceImageInputStream.java index 40a65067ec3..b3ac3af7878 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpaceImageInputStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/AddressSpaceImageInputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/Dump.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/Dump.java index 442de574c0b..32330e24406 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/Dump.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/Dump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MVSFileReader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MVSFileReader.java index 128575d169e..6801a6eae3b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MVSFileReader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MVSFileReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MutableAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MutableAddressSpace.java index e934d81812b..af2481fd3d3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MutableAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/MutableAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SearchListener.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SearchListener.java index 303b671e45b..7f799ee1aab 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SearchListener.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SearchListener.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SystemTrace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SystemTrace.java index 1492d9b318c..5349b335169 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SystemTrace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/SystemTrace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.dumpreader; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/pcnumbers.properties b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/pcnumbers.properties index 8d3e77c1fd3..96b20437bdb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/pcnumbers.properties +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/pcnumbers.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This file contains the mapping of PC numbers to their associated description. # It was obtained by running the output of "IP SYSTRACE" through something like: diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/ssrvnumbers.properties b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/ssrvnumbers.properties index e30a1baa3c1..ecf10066d66 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/ssrvnumbers.properties +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/ssrvnumbers.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This file contains the mapping of SSRV numbers to their associated description. # It was obtained by running the output of "IP SYSTRACE" through something like: diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/svcnumbers.properties b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/svcnumbers.properties index a1d671ac73b..c3c73573a85 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/svcnumbers.properties +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/dumpreader/svcnumbers.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This file contains the mapping of SVC numbers to their associated description. # It was obtained by running the output of "IP SYSTRACE" through something like: diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa.java index dbac229d1e0..29ba33dea13 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32Template.java index eae0fa03a1c..f38e0cd4eeb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32_11Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32_11Template.java index 759fbc6355b..4745cb24824 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32_11Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa32_11Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64Template.java index 7e87f542aa6..bc42d791810 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64_11Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64_11Template.java index c7a36b054cd..7f737ed98d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64_11Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Caa64_11Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaNotFound.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaNotFound.java index 7c8a6738de4..637c6895cb8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaNotFound.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaNotFound.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaTemplate.java index 4c6d6dfeaf4..e6659a8d48e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CaaTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsaTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsaTemplate.java index 237b90b2338..d404b202bf4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsaTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsaTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp32Template.java index aad7e0c7d1f..5171ff0588e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp64Template.java index ca8adf77288..0c7a0abe7b6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsahpTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsahpTemplate.java index 1d17217c57e..7c6c8a3c374 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsahpTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeedsahpTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition32Template.java index 1ba87d77635..2f8fb8bdd1b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition64Template.java index e85e6e981c7..e1d6c8fb68a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transition64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transitionTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transitionTemplate.java index 48711f80d02..d07dd1b8560 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transitionTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceedsahp_transitionTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeelcaTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeelcaTemplate.java index f742e5d1902..704d5dbdc9c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeelcaTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeelcaTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibTemplate.java index 3b520ba3c6b..aa850081ed1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibhTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibhTemplate.java index e3e052ea132..f973768c86b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibhTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexcibhTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb32Template.java index ddddce62856..daf8a070197 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb64Template.java index 5469d73842a..c9b15d54476 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdlcb64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexdlcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexdlcbTemplate.java index 034188907ff..715d92f4e8a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexdlcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexdlcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdsaf.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdsaf.java index b7b85e36838..b33602ff864 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdsaf.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexdsaf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb32Template.java index ed9f2fc535e..f6567288f66 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb64Template.java index 71d92dc8627..5d9098b9e29 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexedb64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexedbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexedbTemplate.java index 5fe31ed0d4f..f2fe906d98a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexedbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexedbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom32Template.java index 5da951029a8..b10b58242cf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom64Template.java index a13acb8a1f0..ade8a781f18 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhcom64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhcomTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhcomTemplate.java index 1577b94913a..5a896997a96 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhcomTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhcomTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhepvTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhepvTemplate.java index cdd60c81d8d..880b9bcf22b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhepvTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexhepvTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhp1bTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhp1bTemplate.java index 10d2318010f..43182443411 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhp1bTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexhp1bTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexlaaTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexlaaTemplate.java index f85e1eac036..b9ceb061b70 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexlaaTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexlaaTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexoepvTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexoepvTemplate.java index 682f2bd7257..19f4d30c7b4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexoepvTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexoepvTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexpp1bTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexpp1bTemplate.java index 8635a3af9a8..2c5aa238e19 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexpp1bTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexpp1bTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb32Template.java index 890daacda9c..d3ee406042e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb64Template.java index d3daaf5f37c..445f3db5c5d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcb64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbTemplate.java index 20576e8245e..af56a723ab9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool32Template.java index dd25e446bb5..704e66dd4dc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool64Template.java index ee722fa078f..ca469b53c9d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexqpcbpool64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbpoolTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbpoolTemplate.java index f53f05aa431..2fb6535ad35 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbpoolTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexqpcbpoolTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb32Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb32Template.java index 112d073a0d3..c6de22cbbda 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb32Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb32Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb64Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb64Template.java index fc89ceacc08..d25ef657eee 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb64Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ceexrcb64Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexrcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexrcbTemplate.java index c3c274e3528..c4cad069f23 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexrcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexrcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsancTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsancTemplate.java index 40c511a4f84..b5011fb659c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsancTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsancTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsfxmTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsfxmTemplate.java index 8c0ba75b304..6dee005052b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsfxmTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexsfxmTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexstkhTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexstkhTemplate.java index 202ee7af97f..44e819eafa6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexstkhTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeexstkhTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbTemplate.java index efee0b65c3d..af1adf34373 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbeTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbeTemplate.java index 6c0aeeee7b7..7c47966ee50 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbeTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CeextvbeTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpFuncEntryTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpFuncEntryTemplate.java index 3ef845a3465..c721cc6fa20 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpFuncEntryTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpFuncEntryTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpVarEntryTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpVarEntryTemplate.java index 49dfc3d7d96..1b60d9a1a99 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpVarEntryTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2ExpVarEntryTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2Template.java index ccd1b61d1f2..e859cf85de1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Ciet2Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietExpEntryTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietExpEntryTemplate.java index 9def2fbe8b1..e2282a62bf0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietExpEntryTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietExpEntryTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietTemplate.java index 01f74807cb1..e9d27409eab 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/CietTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Dll.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Dll.java index 0c5c51a0ddd..c9f0d41af5d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Dll.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Dll.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllFunction.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllFunction.java index fb8abcfce3d..0664ba34d2a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllFunction.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllFunction.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllVariable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllVariable.java index 1e45747aee2..7195c7f7fa8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllVariable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllVariable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllcsectTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllcsectTemplate.java index b1d5bf5d190..52045ec3bed 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllcsectTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllcsectTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpfuncsTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpfuncsTemplate.java index f8341f2f4e4..44ae3ff6eea 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpfuncsTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpfuncsTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpvarsTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpvarsTemplate.java index 3685e4a8664..6d922a41cd6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpvarsTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DllexpvarsTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DsaStackFrame.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DsaStackFrame.java index c1d04ff8acc..a0208da6fea 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DsaStackFrame.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/DsaStackFrame.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Edb.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Edb.java index dbd260292be..dbe70a215ed 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Edb.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Edb.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/EnsmTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/EnsmTemplate.java index 99709afa0bd..756fd188228 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/EnsmTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/EnsmTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Function.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Function.java index 1759c20a60a..8f5981ac7ba 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Function.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/Function.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/FunctionEmulator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/FunctionEmulator.java index cf87550055c..99cf5945f8b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/FunctionEmulator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/FunctionEmulator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/SmcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/SmcbTemplate.java index 7280a45db10..2a1c2a17358 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/SmcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/SmcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/StackNotFound.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/StackNotFound.java index 5e5b3a77245..c4faa0a4d97 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/StackNotFound.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/le/StackNotFound.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.le; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzotcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzotcbTemplate.java index e3cb2a69f83..382b918504b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzotcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzotcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzustaTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzustaTemplate.java index 721c74c2c63..6626a7c663f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzustaTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/BpxzustaTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/CeexcvtTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/CeexcvtTemplate.java index 8b7ac8eb8f4..0e648414cb9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/CeexcvtTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/CeexcvtTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaascbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaascbTemplate.java index 42fbd06aa9b..b71f80482e9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaascbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaascbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaasxbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaasxbTemplate.java index 944c0a56f28..50615137dfb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaasxbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaasxbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhapsaTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhapsaTemplate.java index 0b4ecfd794a..431d44d2824 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhapsaTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhapsaTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IharbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IharbTemplate.java index f4460b67ecb..1b1c50e8218 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IharbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IharbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Ihartm2aTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Ihartm2aTemplate.java index e604b146a78..c0c12bfee0f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Ihartm2aTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Ihartm2aTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhastcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhastcbTemplate.java index 5860a556229..9c83e4d9cb6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhastcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhastcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhawebTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhawebTemplate.java index 83e67d8aadc..be1796957ce 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhawebTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhawebTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaxsbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaxsbTemplate.java index 3b7de4d2c77..a6dd5ecd9b6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaxsbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IhaxsbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbTemplate.java index 84d0c16b541..ffda37767d4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbprefixTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbprefixTemplate.java index 3e298afed7f..b5ed9eb064a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbprefixTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjrbprefixTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjtcbTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjtcbTemplate.java index 024409edd24..e9648f8ac84 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjtcbTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/IkjtcbTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lse.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lse.java index 7ba431ec8c2..a1bb54570ed 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lse.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lse.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsedTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsedTemplate.java index 9905ebc5f8a..11171abd9e6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsedTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsedTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lses1lsed1Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lses1lsed1Template.java index 832dbe57d86..99c02610a2c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lses1lsed1Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lses1lsed1Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LseslsedTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LseslsedTemplate.java index 063e8ffe044..56e10ac5e0e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LseslsedTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LseslsedTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lsestate1Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lsestate1Template.java index 06e19edccb6..bc449490c00 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lsestate1Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Lsestate1Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsestateTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsestateTemplate.java index 241d1513ad7..d5130161481 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsestateTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/LsestateTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/OtcbcopyonforkTemplate.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/OtcbcopyonforkTemplate.java index 370cd8db80a..4e5dee9a3f1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/OtcbcopyonforkTemplate.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/OtcbcopyonforkTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Rb.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Rb.java index eaa2d32e4dd..8c13a3af2e2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Rb.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Rb.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/RegisterSet.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/RegisterSet.java index e58f2cf73f8..f0c8a224cd6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/RegisterSet.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/RegisterSet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Tcb.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Tcb.java index 0c4862d48b6..86a16f824b7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Tcb.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/mvs/Tcb.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.mvs; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractHashMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractHashMap.java index c9e2d520729..fd09f177cfc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractHashMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractHashMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractLruCache.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractLruCache.java index 0109975de34..203b71fb718 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractLruCache.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/AbstractLruCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitSetArray.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitSetArray.java index 5ef976e1050..11e3f25a6bd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitSetArray.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitSetArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitStream.java index e3a0c5e475e..c9ab3d523c6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/BitStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CharConversion.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CharConversion.java index eb3f094679c..185d614fdfe 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CharConversion.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CharConversion.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CompressedRecordArray.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CompressedRecordArray.java index efe281ec5f5..2048399dc50 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CompressedRecordArray.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/CompressedRecordArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Emulator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Emulator.java index cae70f51df8..f9f780d4720 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Emulator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Emulator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/FileFormatException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/FileFormatException.java index 03009d9bce9..2d691a980d9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/FileFormatException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/FileFormatException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntEnumeration.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntEnumeration.java index f40c22069b2..d6f565c9d4d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntEnumeration.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntEnumeration.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerArray.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerArray.java index c00e962a5a4..45f64213039 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerArray.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerLruCache.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerLruCache.java index 3b061d4a5df..35a806a6c0c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerLruCache.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerLruCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerMap.java index 726ff5c673d..93aebe26e59 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerSet.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerSet.java index d0396dc5f8b..7a96beebaa2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerSet.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerSet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerStack.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerStack.java index b431f822c04..dfb7376f006 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerStack.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/IntegerStack.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/InvalidTemplateFile.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/InvalidTemplateFile.java index b1f68b58615..b75024c1038 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/InvalidTemplateFile.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/InvalidTemplateFile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LogFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LogFormatter.java index 69f78eae86d..d2aa1f01fbd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LogFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LogFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LongArray.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LongArray.java index 3d739e003e6..92d8d90f523 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LongArray.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/LongArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/NullIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/NullIterator.java index c618ad14ac5..efafb805d75 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/NullIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/NullIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectLruCache.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectLruCache.java index 53fdd703666..60c1082ca22 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectLruCache.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectLruCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectMap.java index 2dadd5e9aa8..8221c18309c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ObjectMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/PrimitiveArray.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/PrimitiveArray.java index 191489f9d6f..1ad7563f328 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/PrimitiveArray.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/PrimitiveArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ProgressMeter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ProgressMeter.java index 37d71be5aab..e2d22b556ab 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ProgressMeter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/ProgressMeter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SingletonIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SingletonIterator.java index 743db720e21..c654a0d36c5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SingletonIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SingletonIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SortListener.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SortListener.java index cf37aa10d0c..a9393c4d698 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SortListener.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/SortListener.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Template.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Template.java index 3f85def8849..5177d171ea0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Template.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/Template.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/TemplateField.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/TemplateField.java index 4a0b0636678..9a4e3d2e3bc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/TemplateField.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/corereaders/tdump/zebedee/util/TemplateField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.tdump.zebedee.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/events/IEventListener.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/events/IEventListener.java index 96cc81843d2..b465ee4d977 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/events/IEventListener.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/events/IEventListener.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.events; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/CorruptStructuresException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/CorruptStructuresException.java index a9978e2dab5..96a32652fd0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/CorruptStructuresException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/CorruptStructuresException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.exceptions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotDDREnabledException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotDDREnabledException.java index 8eff137895d..041b74dcf98 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotDDREnabledException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotDDREnabledException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.exceptions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotFoundException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotFoundException.java index 73a52f91d7b..8b9f8dc5c81 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotFoundException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/JVMNotFoundException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.exceptions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/MissingDDRStructuresException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/MissingDDRStructuresException.java index 4b4fbf2028e..39973a748c2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/MissingDDRStructuresException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/MissingDDRStructuresException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.exceptions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/UnknownArchitectureException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/UnknownArchitectureException.java index 21ba2626037..3474a8ca0d2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/UnknownArchitectureException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/exceptions/UnknownArchitectureException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.exceptions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/CoreFileResolver.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/CoreFileResolver.java index e8b0d673bdb..c14082ea2c4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/CoreFileResolver.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/CoreFileResolver.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DDRLibraryAdapter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DDRLibraryAdapter.java index 5b7bc5e87ac..b4ca7958ab6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DDRLibraryAdapter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DDRLibraryAdapter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DTFJLibraryAdapter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DTFJLibraryAdapter.java index 8c27a34c574..fef5fe66fbe 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DTFJLibraryAdapter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/DTFJLibraryAdapter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/Footer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/Footer.java index 5e5797cf4d8..587dd169e00 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/Footer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/Footer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/FooterLibraryEntry.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/FooterLibraryEntry.java index e710cbde6b4..35ad9b1379f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/FooterLibraryEntry.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/FooterLibraryEntry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryAdapter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryAdapter.java index 7cd3ecfb997..5cf23994ea2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryAdapter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryAdapter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryCollector.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryCollector.java index 68a7cf697f8..d2d45f65fa5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryCollector.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/LibraryCollector.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/MonitoredFileOutputStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/MonitoredFileOutputStream.java index 77d7c200172..5f0cd88b144 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/MonitoredFileOutputStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/MonitoredFileOutputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingFileInputStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingFileInputStream.java index 9934bcb049b..30d9cac6ba8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingFileInputStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingFileInputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingImageInputStream.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingImageInputStream.java index 8bd9e35c3ec..99c0a8e9ebc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingImageInputStream.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/libraries/SlidingImageInputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.libraries; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/BasicFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/BasicFormatter.java index 819401a5e09..27faa033323 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/BasicFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/BasicFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.logging; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/LoggerNames.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/LoggerNames.java index 8e8c0702a68..23cc59d09c9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/LoggerNames.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/logging/LoggerNames.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.logging; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/AddStructureBlob.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/AddStructureBlob.java index b450b3b12d3..b2180f4f09c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/AddStructureBlob.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/AddStructureBlob.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ClassGenerator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ClassGenerator.java index e59942ef4ad..a445e77470f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ClassGenerator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/DTFJWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/DTFJWalker.java index e0a28c47bad..0a5152b255c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/DTFJWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/DTFJWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/FlagStructureList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/FlagStructureList.java index 826283af3ed..71ea17d846b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/FlagStructureList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/FlagStructureList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/PointerGenerator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/PointerGenerator.java index d737452185a..1a2f6e28a98 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/PointerGenerator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/PointerGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools; @@ -1524,7 +1524,7 @@ private static void writeCopyright(PrintWriter writer) { writer.println(" * [1] https://www.gnu.org/software/classpath/license.html"); writer.println(" * [2] https://openjdk.org/legal/assembly-exception.html"); writer.println(" *"); - writer.println(" * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception"); + writer.println(" * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0"); writer.println(" *******************************************************************************/"); } diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/StructureStubGenerator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/StructureStubGenerator.java index 6cb5f5f6867..2d70d29cfed 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/StructureStubGenerator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/StructureStubGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools; @@ -438,7 +438,7 @@ private static void writeCopyright(PrintWriter writer) { writer.println(" * [1] https://www.gnu.org/software/classpath/license.html"); writer.println(" * [2] https://openjdk.org/legal/assembly-exception.html"); writer.println(" *"); - writer.println(" * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception"); + writer.println(" * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0"); writer.println(" *******************************************************************************/"); } diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ASNoProcess.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ASNoProcess.java index e5ac655a83d..af694f4f96d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ASNoProcess.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ASNoProcess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseFieldFormatter.java index aafd5361e41..71aa65e83ff 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseJVMCommands.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseJVMCommands.java index 7a202f147ec..0d13bc95327 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseJVMCommands.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseJVMCommands.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureCommand.java index 940b2517847..3acf61b6ea2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureFormatter.java index cfdef6b1deb..7cd72d5aee7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/BaseStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Command.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Command.java index a70faca2cca..b5f0139847b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Command.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Command.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/CommandUtils.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/CommandUtils.java index e723aa1b978..65932a56281 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/CommandUtils.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/CommandUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Context.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Context.java index 9f7c8a1dae0..20ca25fbb6d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Context.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Context.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractive.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractive.java index fe5970ac367..691147453b4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractive.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractive.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractiveCommandException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractiveCommandException.java index 575d1b7c7c4..c13c703a70e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractiveCommandException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/DDRInteractiveCommandException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluator.java index 2fac77f0a51..0cd8d9ae673 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluatorException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluatorException.java index d5739eb9e8e..a7a35660976 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluatorException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExpressionEvaluatorException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExtractMemoryCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExtractMemoryCommand.java index 7a7df5ed6d0..84241f04c9b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExtractMemoryCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ExtractMemoryCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FindInMemoryCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FindInMemoryCommand.java index 04e73c8d66b..9c651f11721 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FindInMemoryCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FindInMemoryCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FormatWalkResult.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FormatWalkResult.java index e7236d3e05d..3cf7414f69e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FormatWalkResult.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/FormatWalkResult.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Humanize.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Humanize.java index 9d8dbb03b7e..7bf4f214db1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Humanize.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Humanize.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ICommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ICommand.java index 3e5562863eb..b24ad20b1e6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ICommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/ICommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IFieldFormatter.java index cfe41b10dfe..ce096f12300 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IStructureFormatter.java index 8ef0a97e43b..326cff348c2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/IStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/J9XCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/J9XCommand.java index bd18c4b66b2..93fbab35be4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/J9XCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/J9XCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MemoryRangesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MemoryRangesCommand.java index 08d9eb33156..3ddc898e3cf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MemoryRangesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MemoryRangesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MissingVMData.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MissingVMData.java index f9a3e116c74..237cad19f95 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MissingVMData.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/MissingVMData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/StructureCommandUtil.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/StructureCommandUtil.java index b65e3024761..51038febff2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/StructureCommandUtil.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/StructureCommandUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Table.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Table.java index 1bf8560eff6..095fcaf679e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Table.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/Table.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DataContext.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DataContext.java index cb3748194f4..26b2c45aafe 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DataContext.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DataContext.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.annotations; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DebugExtension.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DebugExtension.java index ff85cb3a2c1..907a32d9c61 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DebugExtension.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/annotations/DebugExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.annotations; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/ForeachCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/ForeachCommand.java index be64169b840..bf93556e079 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/ForeachCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/ForeachCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/GpInfoCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/GpInfoCommand.java index a8f2d8a6be3..39758182d76 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/GpInfoCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/GpInfoCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/LookupSymbolCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/LookupSymbolCommand.java index 57e74148eb3..ede9ec6aff8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/LookupSymbolCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/LookupSymbolCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeLibrariesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeLibrariesCommand.java index 738f4a248a9..f9061a67971 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeLibrariesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeLibrariesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeStacksCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeStacksCommand.java index 239a2ad21ca..8ce484c54bf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeStacksCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/NativeStacksCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapBaseCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapBaseCommand.java index 635ffd043dd..40b91a91440 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapBaseCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapBaseCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatCommand.java index 6816f38eac0..3875b23a98f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatWrapperCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatWrapperCommand.java index 2f1d983500c..9bf5ac6ae61 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatWrapperCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapFormatWrapperCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapTraceCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapTraceCommand.java index f62c60eb001..c5a4761d5c0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapTraceCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/SnapTraceCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TimeCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TimeCommand.java index dc4299087d4..5fb6ba0f1b9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TimeCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TimeCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TraceFileHeaderWriter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TraceFileHeaderWriter.java index 9b77182126b..3fd431b2051 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TraceFileHeaderWriter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/commands/TraceFileHeaderWriter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/DDRInteractiveClassLoader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/DDRInteractiveClassLoader.java index fc190655117..83d36130a2a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/DDRInteractiveClassLoader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/DDRInteractiveClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.plugins; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginCommand.java index d2f8d61d5f5..713952bc15f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.plugins; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginConfig.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginConfig.java index 69ef464df05..34bc2815fce 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginConfig.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/ddrinteractive/plugins/PluginConfig.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive.plugins; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/logging/LogFilter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/logging/LogFilter.java index d27dab7da71..467f36118dd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/logging/LogFilter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/logging/LogFilter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.logging; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/J9DDRStructureStore.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/J9DDRStructureStore.java index 7f752c2d4b9..a4b288a052c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/J9DDRStructureStore.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/J9DDRStructureStore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.store; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureKey.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureKey.java index 062e048e497..309d7c67e59 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureKey.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureKey.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.store; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureMismatchError.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureMismatchError.java index b940c1c6d60..d79af2faf9b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureMismatchError.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/store/StructureMismatchError.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.store; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/xml/XMLDOMComparator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/xml/XMLDOMComparator.java index ac714de1d72..6f20c96fca7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/xml/XMLDOMComparator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/tools/xml/XMLDOMComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.xml; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/GeneratedClassDebugging.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/GeneratedClassDebugging.java index 10bd52e7a27..f525e0d511e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/GeneratedClassDebugging.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/GeneratedClassDebugging.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/IteratorHelpers.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/IteratorHelpers.java index 9d63dd7ad08..a13c586b6db 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/IteratorHelpers.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/IteratorHelpers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/PatternString.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/PatternString.java index 099cc46f11c..c9b18a2b7ab 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/PatternString.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/PatternString.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/RuntimeTypeResolutionUtils.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/RuntimeTypeResolutionUtils.java index 4e3af7426a8..ee1bb4b3c2c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/RuntimeTypeResolutionUtils.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/RuntimeTypeResolutionUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/WeakValueMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/WeakValueMap.java index 03bca3f1699..c2dcab4b31b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/util/WeakValueMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/util/WeakValueMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.util; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJConstants.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJConstants.java index 17c469ff299..3eb5291be5b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJConstants.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJConstants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJCorruptDataException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJCorruptDataException.java index c9e02d61909..3d6eb300121 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJCorruptDataException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/DTFJCorruptDataException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/J9DDRDTFJUtils.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/J9DDRDTFJUtils.java index c6184bafe1b..dbff6cb0b13 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/J9DDRDTFJUtils.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/J9DDRDTFJUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRBaseImageThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRBaseImageThread.java index 814ce9e34b9..2e592ded279 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRBaseImageThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRBaseImageThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRCorruptData.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRCorruptData.java index 8e087f63a43..062fabe5123 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRCorruptData.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRCorruptData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImage.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImage.java index 809877bee53..9ea3c22cb0d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImage.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImage.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageAddressSpace.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageAddressSpace.java index e84a6f35349..651d63e556d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageAddressSpace.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageAddressSpace.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageFactory.java index cc6132a326d..e098a6c2e54 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageModule.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageModule.java index 19502181a00..e5d61ddb23e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageModule.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageModule.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImagePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImagePointer.java index 39eb3483789..9c182c1f056 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImagePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImagePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageProcess.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageProcess.java index d647c6b9d4c..eebc85f69d3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageProcess.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageProcess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageRegister.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageRegister.java index 32b7b851f68..77ee743c42c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageRegister.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageRegister.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSection.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSection.java index cc5744212e5..b9ca5a69af9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSection.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSection.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageStackFrame.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageStackFrame.java index 311399b469c..4bd872e888a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageStackFrame.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageStackFrame.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSymbol.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSymbol.java index 43a07112001..3e29a068cc3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSymbol.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageSymbol.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageThread.java index e947ac0891b..402c7fccdd5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRImageThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRStubImageThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRStubImageThread.java index a3e4c2f09fc..3ce34c90159 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRStubImageThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9DDRStubImageThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9RASImageDataFactory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9RASImageDataFactory.java index f29e49fc9c9..c397cf1b67b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9RASImageDataFactory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/image/J9RASImageDataFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.image; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/IDTFJJavaField.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/IDTFJJavaField.java index e8968ef03e1..bceaa22f524 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/IDTFJJavaField.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/IDTFJJavaField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaClassHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaClassHelper.java index 2e9584290a9..a0b8f8ef831 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaClassHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaClassHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.java.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaFieldHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaFieldHelper.java index cf5cb8fd50c..9e8a0760153 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaFieldHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaFieldHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.java.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaRuntimeHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaRuntimeHelper.java index 745f5afcb33..53329c311a9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaRuntimeHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/dtfj/java/helper/DTFJJavaRuntimeHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.java.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/Bootstrap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/Bootstrap.java index fd3bfd5d3fb..a432044cb7e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/Bootstrap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/Bootstrap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.nativert; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/NativeRuntime.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/NativeRuntime.java index 45ba3bd87c3..c0cb8469a1b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/NativeRuntime.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/view/nativert/NativeRuntime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.nativert; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/DefaultEventListener.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/DefaultEventListener.java index f229d2d9fc7..11ce9b86521 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/DefaultEventListener.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/DefaultEventListener.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.events; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/EventManager.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/EventManager.java index 9b22e8ae900..5ef21deb176 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/EventManager.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/events/EventManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.events; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree.java index 9dd132df8f4..230a42f1c8f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree_29_V0.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree_29_V0.java index 61b33176767..09fa6fc0789 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree_29_V0.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AVLTree_29_V0.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AddressAwareRootScanner.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AddressAwareRootScanner.java index 7f8711622a8..dbdd4d3ee5d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AddressAwareRootScanner.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AddressAwareRootScanner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmPicker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmPicker.java index 678bda12b44..dd634e12ada 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmPicker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmPicker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmVersion.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmVersion.java index 11a2226c9d5..906bcf8cc1d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmVersion.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/AlgorithmVersion.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java index e301710d3e5..27c1b78aed5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ArgBits.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BCNames.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BCNames.java index d62c7184a7f..359049972d8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BCNames.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BCNames.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BaseAlgorithm.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BaseAlgorithm.java index 92f9d90c3b4..fd331a19949 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BaseAlgorithm.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BaseAlgorithm.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BytecodeWalk.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BytecodeWalk.java index 8e5c4eec190..8c249a485d2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BytecodeWalk.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/BytecodeWalk.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ConstantPoolHelpers.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ConstantPoolHelpers.java index 00700467713..66d64640ceb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ConstantPoolHelpers.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ConstantPoolHelpers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/DataType.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/DataType.java index 2ced00f0517..fc06159f418 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/DataType.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/DataType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/GCVMThreadStackSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/GCVMThreadStackSlotIterator.java index 7ff1dfad90d..1466995d5bd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/GCVMThreadStackSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/GCVMThreadStackSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable.java index e616ca74fd4..99f48bddb8d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable_V1.java index ef6efb166cb..b44a4e8b2c9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HashTable_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HiddenInstanceField.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HiddenInstanceField.java index 777b5d62cea..541821c67ae 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HiddenInstanceField.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/HiddenInstanceField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAVLSearchComparator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAVLSearchComparator.java index f498bda3ed9..f138da70c64 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAVLSearchComparator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAVLSearchComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAlgorithm.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAlgorithm.java index f95c7613cc7..f86e4ccfde4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAlgorithm.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IAlgorithm.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IHashTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IHashTable.java index 2d9cd34d676..c9d15721bed 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IHashTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/IHashTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ConstantHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ConstantHelper.java index dc47a35ecd4..f9bbf11bfd0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ConstantHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ConstantHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9JavaStackIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9JavaStackIterator.java index 0f88e184d8f..d3233549b92 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9JavaStackIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9JavaStackIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffset.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffset.java index e3b70ede6ab..da59a879faa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffset.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffset.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator.java index 4c755f262fb..91afbc46e28 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator_V1.java index 461ec97cf3f..10c17068680 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ObjectFieldOffsetIterator_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ROMFieldShapeIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ROMFieldShapeIterator.java index ab43d7f0d0a..855e8cca5b2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ROMFieldShapeIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ROMFieldShapeIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ThreadMonitorHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ThreadMonitorHelper.java index 3c230b75153..b4767856c49 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ThreadMonitorHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9ThreadMonitorHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9VMThreadPointerUtil.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9VMThreadPointerUtil.java index 9762aeb2f43..115441e0d04 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9VMThreadPointerUtil.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/J9VMThreadPointerUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JITLook.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JITLook.java index 08c25d4b1bf..2a03d3d9f99 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JITLook.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JITLook.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JVMTIObjectTagTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JVMTIObjectTagTable.java index 1f08fa5ff98..b5a014d2088 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JVMTIObjectTagTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JVMTIObjectTagTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JavaLangClassLoaderHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JavaLangClassLoaderHelper.java index b08eae1eaa1..0221ed6000e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JavaLangClassLoaderHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/JavaLangClassLoaderHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/LiveSetWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/LiveSetWalker.java index e9528995686..05e254152ac 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/LiveSetWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/LiveSetWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ModuleHashTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ModuleHashTable.java index d1222f238cd..421c5dfa3ab 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ModuleHashTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ModuleHashTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTable.java index c776faab50d..100bcb7d0b0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableList.java index db366ff8303..b1b53328d41 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableListIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableListIterator.java index f42587d6fb9..88ea9b03bb8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableListIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/MonitorTableListIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectAccessBarrier.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectAccessBarrier.java index 0c7a9f6ea72..6f19fd78c2e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectAccessBarrier.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectAccessBarrier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectFieldInfo.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectFieldInfo.java index 76f789414fe..4d6342d79ce 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectFieldInfo.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectFieldInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectHash.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectHash.java index 993321027b1..82fc9004cea 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectHash.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectHash.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectModel.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectModel.java index 7c119c908ac..9232fe52a15 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectModel.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectModel.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor.java index 9014c3cc3cd..27eeb1d5710 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V1.java index 82d6611f626..e1b79937fb5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V2.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V2.java index 5115d47ea19..19efeeb4d1d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V2.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ObjectMonitor_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/OptInfo.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/OptInfo.java index f31fdb6aae9..7dbd9c869ac 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/OptInfo.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/OptInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PCStack.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PCStack.java index 6c3742cceea..2c70ecd382e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PCStack.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PCStack.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PackageHashTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PackageHashTable.java index e9fa56a7a56..28c60ef252e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PackageHashTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/PackageHashTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool.java index 8a029bb882f..19a8059982f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool_29_V0.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool_29_V0.java index 1224b6601f8..f12c6917299 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool_29_V0.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/Pool_29_V0.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ROMHelp.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ROMHelp.java index 7d968e4cec2..935d114ebc6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ROMHelp.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/ROMHelp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootScanner.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootScanner.java index 7b7db33a4cb..6f106757c2d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootScanner.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootScanner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootSet.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootSet.java index 88a5c413904..91965db6565 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootSet.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/RootSet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java index 7750d82f342..adb3074d237 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SendSlot.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SimpleRootScanner.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SimpleRootScanner.java index 97940659863..724d3c97b1c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SimpleRootScanner.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SimpleRootScanner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SlotIterator.java index 3209bb5aac9..f1d9c1368e7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StackRoots.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StackRoots.java index badb57c4848..9a0304113fd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StackRoots.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StackRoots.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StringTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StringTable.java index 9d9d5d17d26..1d24140e795 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StringTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/StringTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitor.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitor.java index 54c54aef424..b8585f73954 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitor.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorSingleTier_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorSingleTier_V1.java index 0674094b1d4..1973b410a78 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorSingleTier_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorSingleTier_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorThreeTier_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorThreeTier_V1.java index cb6e1600b09..68e2ca17ce6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorThreeTier_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/SystemMonitorThreeTier_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMConstantPool.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMConstantPool.java index 7fb2182fdbc..8636bee4569 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMConstantPool.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMConstantPool.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMData.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMData.java index 50838f1764c..97ac2b7b074 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMData.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VMData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VrfyTbl.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VrfyTbl.java index f541851f708..18e3accec27 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VrfyTbl.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/VrfyTbl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/about.html b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/about.html index 68c4ff2a359..2b5b53daea0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/about.html +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptFreeEntryException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptFreeEntryException.java index 12b56b7981a..119dff33967 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptFreeEntryException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptFreeEntryException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptHintException.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptHintException.java index 64c0daa7da5..a8070ec6808 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptHintException.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/CorruptHintException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayObjectModel.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayObjectModel.java index 9d2e5d2b65e..a3d11ee7cd9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayObjectModel.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayObjectModel.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModelBase.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModelBase.java index 84eda0d2fe9..3d596912a67 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModelBase.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModelBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V1.java index 6e9fac35843..aa8103d8e28 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V2.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V2.java index 039790dd947..f612e178012 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V2.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCArrayletObjectModel_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCBase.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCBase.java index 0de4bc9d37e..c8fcffc2d86 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCBase.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardCleaner.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardCleaner.java index 9d3d770c181..f829f7dc246 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardCleaner.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardCleaner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardTable.java index 247801d4344..4e3cb11f37c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCCardTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassArrayClassSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassArrayClassSlotIterator.java index 85facdc5cda..15aa9279283 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassArrayClassSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassArrayClassSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassHeapIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassHeapIterator.java index cfd16d33026..dcbc535e196 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassHeapIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassHeapIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIterator.java index 26f599f2dfa..998e0ecace8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIteratorClassSlots.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIteratorClassSlots.java index fd624964a97..97aa85e541d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIteratorClassSlots.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassIteratorClassSlots.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderIterator.java index 916ff9faa5c..8b66c0e4dee 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentClassesIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentClassesIterator.java index a50e8c8c979..d65934f9aef 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentClassesIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentClassesIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentIterator.java index 099d5126532..554c2cf5d53 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLoaderSegmentIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLocalInterfaceIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLocalInterfaceIterator.java index 1800cd5e3da..ec660464f0f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLocalInterfaceIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassLocalInterfaceIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassStaticsIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassStaticsIterator.java index 142557abeea..68b85ebf251 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassStaticsIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassStaticsIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassSuperclassesIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassSuperclassesIterator.java index a0493fb3474..573f9038622 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassSuperclassesIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCClassSuperclassesIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolClassSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolClassSlotIterator.java index c5c0fd1015c..5fc0f6c940d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolClassSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolClassSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolObjectSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolObjectSlotIterator.java index 0865b614e55..d60ae0aa366 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolObjectSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolObjectSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolSlotIterator.java index d2424a0d713..2844bc02399 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCConstantPoolSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCContiguousArrayObjectModel_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCContiguousArrayObjectModel_V1.java index 361d20ef739..ec291a46ef3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCContiguousArrayObjectModel_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCContiguousArrayObjectModel_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCEmptyObjectIterator_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCEmptyObjectIterator_V1.java index ee7f857f38a..1932a04a6cb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCEmptyObjectIterator_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCEmptyObjectIterator_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCExtensions.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCExtensions.java index 077cc513ffc..0f28f54af12 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCExtensions.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCExtensions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFinalizableObjectIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFinalizableObjectIterator.java index 88d7416718d..51f6196b3bb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFinalizableObjectIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFinalizableObjectIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIterator.java index ddff4b75b91..009f995c075 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorAddressOrderedList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorAddressOrderedList.java index 93afca654cb..c36cc23e5eb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorAddressOrderedList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorAddressOrderedList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorSplitAddressOrderedList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorSplitAddressOrderedList.java index f97f5535dbc..55e06a908ec 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorSplitAddressOrderedList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListHeapIteratorSplitAddressOrderedList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListIteratorAggregatedCellList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListIteratorAggregatedCellList.java index 2059bbfc725..460deef131f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListIteratorAggregatedCellList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCFreeListIteratorAggregatedCellList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader.java index 2afccafb734..eef842659a9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader_V1.java index 3d4ddea0f94..cb6a0c1b057 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapLinkedFreeHeader_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMap.java index f24e3f140a4..c8d724342f1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMapWordIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMapWordIterator.java index b0feb7cb69a..d999c1fc97d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMapWordIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapMapWordIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor.java index 943d9c32a9d..9a5f6277352 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptorSegregated_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptorSegregated_V1.java index 3dd82f8cbda..44b6704067d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptorSegregated_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptorSegregated_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor_V1.java index 636a742cad7..2fe21f227fc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionDescriptor_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionIterator.java index b340b25ca1c..d00dd1ffb27 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionManager.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionManager.java index f1c3b698fb4..97052923e08 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionManager.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapRegionManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapSpanRegionIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapSpanRegionIterator.java index fc7dce73a9e..fe452cedf20 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapSpanRegionIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCHeapSpanRegionIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCIterator.java index 56007434473..1f1b4fa57bd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIGlobalReferenceIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIGlobalReferenceIterator.java index e160e9ee797..d3eef7f9e71 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIGlobalReferenceIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIGlobalReferenceIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIWeakGlobalReferenceIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIWeakGlobalReferenceIterator.java index 5ca533340e9..121940aa666 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIWeakGlobalReferenceIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJNIWeakGlobalReferenceIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableIterator.java index 0d22a809bc8..b8292cb9107 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableListIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableListIterator.java index 07144d4b23f..2780e86b383 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableListIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCJVMTIObjectTagTableListIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMap.java index b46f233e75a..1c523131d82 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMapStandard.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMapStandard.java index 5396c10a8fb..71ba426f7d1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMapStandard.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMarkMapStandard.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPool.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPool.java index 0714fb86ca0..2549643af7c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPool.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPool.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAddressOrderedList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAddressOrderedList.java index 1d08536c7e3..0140d47a784 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAddressOrderedList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAddressOrderedList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAggregatedCellList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAggregatedCellList.java index 0d560a41784..c317e057772 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAggregatedCellList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolAggregatedCellList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolIterator.java index 6445ee1c17d..e6fd65f0208 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolSplitAddressOrderedList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolSplitAddressOrderedList.java index 0586ce5831e..2f7eb900d64 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolSplitAddressOrderedList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMemoryPoolSplitAddressOrderedList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectIterator_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectIterator_V1.java index fae06a4bd74..40689138180 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectIterator_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectIterator_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel.java index 7cf874ae949..89ebd06f92a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel_V1.java index 57ecbbd4781..35f72c04061 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMixedObjectModel_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIterator.java index fe25027987c..74161b79db4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorAOL.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorAOL.java index aa8be9b51aa..d88459b7780 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorAOL.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorAOL.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorSAOL.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorSAOL.java index 4f2aee15f81..dc938214247 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorSAOL.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCModronAllocateHintIteratorSAOL.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMonitorReferenceIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMonitorReferenceIterator.java index 46f395b5683..c4273ea6e78 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMonitorReferenceIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCMonitorReferenceIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIterator.java index 01425ba6838..d959a892f13 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V1.java index 1787d100282..568228b20fc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V2.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V2.java index 181eac861e1..d7a4c34591e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V2.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorAddressOrderedList_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorMarkMapIterator_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorMarkMapIterator_V1.java index 6c6566f8307..9dd6a510596 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorMarkMapIterator_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorMarkMapIterator_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorNullIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorNullIterator.java index d2719b7c82a..39141ec5c98 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorNullIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorNullIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorSegregated_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorSegregated_V1.java index b3cf4195ee7..2616b38e9b6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorSegregated_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectHeapIteratorSegregated_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectIterator.java index 069e2ac8266..25d9137fdaa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectListSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectListSlotIterator.java index 2383a0397ea..d3a97914b63 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectListSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectListSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel.java index a4ad5dea85c..21d064a8ec6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel_V1.java index df3c52ba786..7da3246cf41 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCObjectModel_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCOwnableSynchronizerObjectListIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCOwnableSynchronizerObjectListIterator.java index 95ae0ae0a34..c683345aee4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCOwnableSynchronizerObjectListIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCOwnableSynchronizerObjectListIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayIterator_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayIterator_V1.java index 1f708af77ea..7abb484eafe 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayIterator_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayIterator_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayletIterator_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayletIterator_V1.java index 1b8372e1f15..c92410e22ec 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayletIterator_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCPointerArrayletIterator_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetIterator.java index 5ff61236bfd..4d931f757d9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetSlotIterator.java index 4ec85188fb7..1ecc4dc3a8e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCRememberedSetSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader.java index 74acbab1ed2..f58636752ca 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V1.java index 24b42edcdfa..7cb1108962d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V2.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V2.java index 6dbc7ff9fa8..353da3692ca 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V2.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCScavengerForwardedHeader_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCSegmentIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCSegmentIterator.java index 39408587057..bd83d433d8e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCSegmentIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCSegmentIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStandardMemoryPoolIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStandardMemoryPoolIterator.java index a27451df450..f061f0bcc34 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStandardMemoryPoolIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStandardMemoryPoolIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringCacheTableIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringCacheTableIterator.java index 6c20a4dc249..42943390ef3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringCacheTableIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringCacheTableIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringTableIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringTableIterator.java index 1fee41fed7e..5a6f16555dc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringTableIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCStringTableIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCTarokMemoryPoolIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCTarokMemoryPoolIterator.java index 48061bb4368..39fd073de4b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCTarokMemoryPoolIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCTarokMemoryPoolIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListIterator.java index 14fff5b8bdd..0247e551148 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListSlotIterator.java index 4428c4363b4..daef083378f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedListSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedObjectListIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedObjectListIterator.java index 825d69abc8e..aaaeefa385e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedObjectListIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCUnfinalizedObjectListIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMClassSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMClassSlotIterator.java index b53d4f809d5..e2c909560a0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMClassSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMClassSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadIterator.java index 912a81b61c5..69484a5bff2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadJNISlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadJNISlotIterator.java index 5cb70cdfb18..fc0f58f1e63 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadJNISlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadJNISlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadListIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadListIterator.java index d21ab2d3d01..621c9582fa3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadListIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadListIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadMonitorRecordSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadMonitorRecordSlotIterator.java index 16235276ce1..ad9919a4be5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadMonitorRecordSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadMonitorRecordSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadSlotIterator.java index 57371f31c97..178552b692e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/GCVMThreadSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier.java index 4d9696dba8b..30c75981b2d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier_V1.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier_V1.java index 5e505030515..0ca718160c2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier_V1.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMObjectAccessBarrier_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistIterator.java index 5ec98dfb16f..c2e244c6fc1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistSlotIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistSlotIterator.java index 8deeccabe18..9f337d1b8e8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistSlotIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/gc/MMSublistSlotIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.gc; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/DebugLocalMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/DebugLocalMap.java index e25bf46a7b3..6323855f60c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/DebugLocalMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/DebugLocalMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackmap; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/LocalMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/LocalMap.java index 3eab1a1fdd7..f5e7bb38a25 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/LocalMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/LocalMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackmap; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/MapHelpers.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/MapHelpers.java index 74a1ae3be70..ecf601c833d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/MapHelpers.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/MapHelpers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackmap; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java index 7b2cae00e97..15b86f09e2a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackmap/StackMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackmap; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/BaseStackWalkerCallbacks.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/BaseStackWalkerCallbacks.java index 463be758296..27dc209a4d0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/BaseStackWalkerCallbacks.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/BaseStackWalkerCallbacks.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/FrameCallbackResult.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/FrameCallbackResult.java index 47f0ba30436..564a95b597c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/FrameCallbackResult.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/FrameCallbackResult.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/IStackWalkerCallbacks.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/IStackWalkerCallbacks.java index 4ecd9876f2e..6d771f2be54 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/IStackWalkerCallbacks.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/IStackWalkerCallbacks.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITRegMap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITRegMap.java index 7871bcfe893..b9adad17b1e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITRegMap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITRegMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITStackWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITStackWalker.java index 92d40aeb09c..66d2e9ecae1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITStackWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/JITStackWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MapIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MapIterator.java index da984aed0d1..59ba97e42b2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MapIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MapIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MethodMetaData.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MethodMetaData.java index f5bd9303f93..705f0a54057 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MethodMetaData.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/MethodMetaData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkResult.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkResult.java index d0e26a7d4ce..2ed539866b2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkResult.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkResult.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalker.java index aeba65d7852..a781ee492eb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkerUtils.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkerUtils.java index e86c99e84d8..1d1e85c23bc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkerUtils.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/StackWalkerUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/TerseStackWalkerCallbacks.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/TerseStackWalkerCallbacks.java index d6190b0b927..2322784b403 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/TerseStackWalkerCallbacks.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/TerseStackWalkerCallbacks.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/WalkState.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/WalkState.java index 29b1f9e62c1..83f2d4503ef 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/WalkState.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/stackwalker/WalkState.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.stackwalker; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ArrayIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ArrayIterator.java index b3f6316d0a7..e162ca5e450 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ArrayIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ArrayIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassIterator.java index 4f86fbbec99..8544b724718 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassSegmentIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassSegmentIterator.java index 28be3302ea0..63b2cb82adb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassSegmentIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ClassSegmentIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/FilteredROMClassesIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/FilteredROMClassesIterator.java index cc9328a2320..fff18b7de35 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/FilteredROMClassesIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/FilteredROMClassesIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalker.java index 79f0f9ea5e7..46aac7fbe42 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalkerEvents.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalkerEvents.java index 2c2e6bfbd58..fd067ab5086 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalkerEvents.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/HeapWalkerEvents.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9MemTagIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9MemTagIterator.java index 4fb6ce30632..cbefc7d81a9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9MemTagIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9MemTagIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9ROMClassAndMethod.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9ROMClassAndMethod.java index cc1be9cb62f..25909f4020d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9ROMClassAndMethod.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/J9ROMClassAndMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumber.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumber.java index 1dc313c9ef3..9f3a3eb12f3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumber.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumber.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumberIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumberIterator.java index 03e00d7254f..0fca98c956e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumberIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LineNumberIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTable.java index fd3145949d7..5de3dcf6e6d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTableIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTableIterator.java index ed2ac20e420..13d9abe16fc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTableIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/LocalVariableTableIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemoryCategoryIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemoryCategoryIterator.java index b980677202c..fdcbd412648 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemoryCategoryIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemoryCategoryIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemorySegmentIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemorySegmentIterator.java index 5defd4e3c16..1f86e2ef220 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemorySegmentIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MemorySegmentIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MonitorIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MonitorIterator.java index 9c2986e922b..a73771fae13 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MonitorIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/MonitorIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesIterator.java index f91e156ad45..1d9213ac8d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesRangeIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesRangeIterator.java index de64761fdd1..b78ad00ffae 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesRangeIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/j9/walkers/ROMClassesRangeIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.j9.walkers; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/AbstractPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/AbstractPointer.java index 212ecb36fdb..6ba99c9329e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/AbstractPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/AbstractPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/BoolPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/BoolPointer.java index 56b81265d86..5b8272ce77f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/BoolPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/BoolPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/CorruptPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/CorruptPointer.java index 602c3aea851..6ed4c67bf6d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/CorruptPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/CorruptPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/DoublePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/DoublePointer.java index a12644ed873..20e6133fb97 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/DoublePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/DoublePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/EnumPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/EnumPointer.java index d6fc0b88965..7b68d69086b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/EnumPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/EnumPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/FloatPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/FloatPointer.java index db9b84067ba..24b053985e7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/FloatPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/FloatPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I16Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I16Pointer.java index 40bbb950a02..b2204700824 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I16Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I16Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I32Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I32Pointer.java index f9f928adbf3..f24d625180f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I32Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I32Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I64Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I64Pointer.java index b7f6ff7652e..9a4632f8f2e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I64Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I64Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I8Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I8Pointer.java index 1a3eb52ed46..ae26208cee8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I8Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/I8Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/IDATAPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/IDATAPointer.java index 0680fa8334b..a06746a79d3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/IDATAPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/IDATAPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectClassReferencePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectClassReferencePointer.java index 128aad72736..62f4b136e16 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectClassReferencePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectClassReferencePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectMonitorReferencePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectMonitorReferencePointer.java index 53f90ca48b4..3d9f90a7785 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectMonitorReferencePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectMonitorReferencePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectReferencePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectReferencePointer.java index d7836d9536f..543150f7a06 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectReferencePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/ObjectReferencePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/Pointer.java index 6d406b65083..4beaf6a61f2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/PointerPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/PointerPointer.java index 548a95ce0e9..aceece24da1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/PointerPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/PointerPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/SelfRelativePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/SelfRelativePointer.java index 4b3cd22dcae..12265a96905 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/SelfRelativePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/SelfRelativePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/StructurePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/StructurePointer.java index 91b899debcb..13f7496caa1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/StructurePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/StructurePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U16Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U16Pointer.java index 12112f89ddd..0d5a898b261 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U16Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U16Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U32Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U32Pointer.java index b38f4d881a8..950414f622f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U32Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U32Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U64Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U64Pointer.java index 9de18658a8a..4bd1726e46a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U64Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U64Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U8Pointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U8Pointer.java index 3da2dd01020..c93c2e25875 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U8Pointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/U8Pointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/UDATAPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/UDATAPointer.java index 4be3a36fd48..becad8e4e71 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/UDATAPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/UDATAPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/VoidPointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/VoidPointer.java index 5f44c979708..92781b96970 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/VoidPointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/VoidPointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/WideSelfRelativePointer.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/WideSelfRelativePointer.java index b92f1cff37a..3f0e2b40f2b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/WideSelfRelativePointer.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/WideSelfRelativePointer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/AttachedDataWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/AttachedDataWrapperHelper.java index e559b229347..8bc721eefdb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/AttachedDataWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/AttachedDataWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ByteDataWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ByteDataWrapperHelper.java index c1c6a7e6538..55c5ad4a07b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ByteDataWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ByteDataWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CacheletWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CacheletWrapperHelper.java index 86c50cab840..d5ef055bed4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CacheletWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CacheletWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CharArrayWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CharArrayWrapperHelper.java index da7b817f3cb..0db56e1ac28 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CharArrayWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CharArrayWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathEntryItemHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathEntryItemHelper.java index 2881951a084..b03caf9ad8c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathEntryItemHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathEntryItemHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathItemHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathItemHelper.java index 642dfbff47f..53de29b7f0e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathItemHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathItemHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathWrapperHelper.java index b3ecddcd9c5..34ee463b4ef 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ClasspathWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CompiledMethodWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CompiledMethodWrapperHelper.java index 7f7f6f5abf3..ac3a316c535 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CompiledMethodWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/CompiledMethodWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ArrayClassHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ArrayClassHelper.java index 32713f41e5b..802890e4c2f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ArrayClassHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ArrayClassHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java index 441e75d8868..66ff2824954 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java index 3200c44ff5c..ad902f32732 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ClassLoaderHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9IndexableObjectHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9IndexableObjectHelper.java index 58a1d744311..73bbcffa666 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9IndexableObjectHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9IndexableObjectHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9JavaVMHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9JavaVMHelper.java index 5b4b2fe6d43..41aae029e53 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9JavaVMHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9JavaVMHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MemTagHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MemTagHelper.java index db201852e31..8f3b4f0e25a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MemTagHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MemTagHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodDebugInfoHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodDebugInfoHelper.java index 60e45da3028..875774151bc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodDebugInfoHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodDebugInfoHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodHelper.java index 3d4f6ca3868..118c55678b1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9MethodHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectHelper.java index 77c78812250..32c46e4e613 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectMonitorHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectMonitorHelper.java index 519b80add31..eaba9e332e5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectMonitorHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ObjectMonitorHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9RASHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9RASHelper.java index 9cb73601b30..39eaec78e28 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9RASHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9RASHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMClassHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMClassHelper.java index 02c323bc2e0..c9ee34ddc1c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMClassHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMClassHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMFieldShapeHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMFieldShapeHelper.java index 57c654da22c..5966a29b734 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMFieldShapeHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMFieldShapeHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMMethodHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMMethodHelper.java index d76c5eb5708..194a7f82bb9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMMethodHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ROMMethodHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ThreadHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ThreadHelper.java index 803b8b8223c..de9a4dff627 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ThreadHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9ThreadHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9UTF8Helper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9UTF8Helper.java index 199c5cf7399..bf1b4115df7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9UTF8Helper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9UTF8Helper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9VMThreadHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9VMThreadHelper.java index fa95c75d1ba..8abbd25ecb0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9VMThreadHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/J9VMThreadHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/MM_HeapRegionDescriptorHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/MM_HeapRegionDescriptorHelper.java index 49bdb2ebf26..6b8d9a9234c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/MM_HeapRegionDescriptorHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/MM_HeapRegionDescriptorHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OMRMemCategoryHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OMRMemCategoryHelper.java index fc2b8f12740..8cd2d761c18 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OMRMemCategoryHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OMRMemCategoryHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OrphanWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OrphanWrapperHelper.java index ec96cb22bbd..422d99f8f91 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OrphanWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/OrphanWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/PrintObjectFieldsHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/PrintObjectFieldsHelper.java index dec790948b6..e62241b54c9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/PrintObjectFieldsHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/PrintObjectFieldsHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ROMClassWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ROMClassWrapperHelper.java index 7118143308a..fe561abd900 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ROMClassWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ROMClassWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ScopedROMClassWrapperHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ScopedROMClassWrapperHelper.java index 329518ce2f8..f155a0f38db 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ScopedROMClassWrapperHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ScopedROMClassWrapperHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/SharedClassesMetaDataHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/SharedClassesMetaDataHelper.java index 707403f3774..232baa9b9fb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/SharedClassesMetaDataHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/SharedClassesMetaDataHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHdrHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHdrHelper.java index 4635b8e7964..870e7ae3b60 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHdrHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHdrHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHelper.java index b0ecffd37f5..49d92a14586 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ShcItemHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java index 871a5892076..ff848b6b34f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/pointer/helper/ValueTypeHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.pointer.helper; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassSummaryHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassSummaryHelper.java index 4e1e648a342..a36d5ba1d45 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassSummaryHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassSummaryHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassWalker.java index 310531e1351..4c774d8ce67 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ClassWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FilteredROMMethodsIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FilteredROMMethodsIterator.java index 49cdb4e11b4..a5a42a46bae 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FilteredROMMethodsIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FilteredROMMethodsIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FindVMTask.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FindVMTask.java index 357d9d1d21a..5b777e9e8fa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FindVMTask.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/FindVMTask.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/GetCommandsTask.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/GetCommandsTask.java index da89c058c43..fc574fca5fc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/GetCommandsTask.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/GetCommandsTask.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/IClassWalkCallbacks.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/IClassWalkCallbacks.java index 217c0e72948..d5a32497458 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/IClassWalkCallbacks.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/IClassWalkCallbacks.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/JavaVersionHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/JavaVersionHelper.java index b43707af4b8..b45f3214e9a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/JavaVersionHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/JavaVersionHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/LinearDumper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/LinearDumper.java index c21673100d4..18e6600b294 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/LinearDumper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/LinearDumper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ModularityHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ModularityHelper.java index 3c66850b970..b861a90f65d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ModularityHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ModularityHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RamClassWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RamClassWalker.java index bfc006b54e8..8c5a9dcc788 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RamClassWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RamClassWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RomClassWalker.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RomClassWalker.java index f96ededa0c1..ce426ef544c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RomClassWalker.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RomClassWalker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RuntimeTypeResolutionHelper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RuntimeTypeResolutionHelper.java index cd231c13dc4..6cfb2a34599 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RuntimeTypeResolutionHelper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/RuntimeTypeResolutionHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/StructureCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/StructureCommand.java index c1067ab6231..afc9fa47803 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/StructureCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/StructureCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ThreadsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ThreadsCommand.java index 2f9a0d367ad..f3afa93bbed 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ThreadsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/ThreadsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/VirtualThreadsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/VirtualThreadsCommand.java index 4774d7f739c..edf0d69975b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/VirtualThreadsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/VirtualThreadsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/WhatIsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/WhatIsCommand.java index ab0c194b16a..1a1debb6bbc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/WhatIsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/WhatIsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ACCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ACCommand.java index 380bd7a0899..c0f45325176 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ACCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ACCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AllClassesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AllClassesCommand.java index a9a0accd7ad..7cd01cd5e03 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AllClassesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AllClassesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AnalyseRomClassUTF8Command.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AnalyseRomClassUTF8Command.java index 3e342cca91c..f3dc85d94b0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AnalyseRomClassUTF8Command.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/AnalyseRomClassUTF8Command.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BuildFlagsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BuildFlagsCommand.java index 19fb99ae680..aacc910f177 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BuildFlagsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BuildFlagsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ByteCodeDumper.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ByteCodeDumper.java index f697aa86f58..3d98fd36b73 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ByteCodeDumper.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ByteCodeDumper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BytecodesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BytecodesCommand.java index 5c43a9cf95e..2608204b094 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BytecodesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/BytecodesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CPDescriptionCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CPDescriptionCommand.java index cd19500c7dd..c13b92618aa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CPDescriptionCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CPDescriptionCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassForNameCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassForNameCommand.java index 4115e83c973..2bdf5fcd6fd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassForNameCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassForNameCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassloadersSummaryCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassloadersSummaryCommand.java index ade5a818d0a..a812db30af4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassloadersSummaryCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ClassloadersSummaryCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CompressedRefMappingCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CompressedRefMappingCommand.java index c9c2be4c1aa..6177b215c12 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CompressedRefMappingCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CompressedRefMappingCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CoreInfoCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CoreInfoCommand.java index e309088d979..125821bf5e2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CoreInfoCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/CoreInfoCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassesInModuleCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassesInModuleCommand.java index 7ea0a5e808b..55e0f0ed0f9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassesInModuleCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassesInModuleCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassloadersCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassloadersCommand.java index cee6f0c51fe..0527f245061 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassloadersCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllClassloadersCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRamClassLinearCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRamClassLinearCommand.java index dfae2129736..a05b49c1cbc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRamClassLinearCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRamClassLinearCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRegionsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRegionsCommand.java index 62fee5e0865..c49fb89899d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRegionsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRegionsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRomClassLinearCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRomClassLinearCommand.java index c61b0cb3065..c578404ee6c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRomClassLinearCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllRomClassLinearCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllSegmentsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllSegmentsCommand.java index cc46753e586..439ac363e02 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllSegmentsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpAllSegmentsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpContendedLoadTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpContendedLoadTable.java index 0787f2ef42f..a2a2f88d7e5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpContendedLoadTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpContendedLoadTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleCommand.java index 4f1ad62cc12..ee3ea387684 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleDirectedExportsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleDirectedExportsCommand.java index 2e5b107229a..ecbf9d74411 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleDirectedExportsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleDirectedExportsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleExportsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleExportsCommand.java index ef71094cbfe..9fb8dc60479 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleExportsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleExportsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleReadsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleReadsCommand.java index 79e6e5be03a..7b6d0544ca5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleReadsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpModuleReadsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpPackageCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpPackageCommand.java index ca6bbb9ee92..3d18b71b3f2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpPackageCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpPackageCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRamClassLinearCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRamClassLinearCommand.java index 0f82191b9b2..f5bb8fc93fc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRamClassLinearCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRamClassLinearCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassCommand.java index 05be4140d68..999ad0458f0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassLinearCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassLinearCommand.java index fa20780a2a5..2e690ae4b5e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassLinearCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomClassLinearCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomMethodCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomMethodCommand.java index daba6014d27..ade58ff44f3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomMethodCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpRomMethodCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegmentsInListCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegmentsInListCommand.java index bd5490224d3..e69c260f0d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegmentsInListCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegmentsInListCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegregatedStatsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegregatedStatsCommand.java index b0cdbad0102..8c03d56f139 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegregatedStatsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpSegregatedStatsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpStringTableCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpStringTableCommand.java index 1c8dcf93c8d..f2ded72d42d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpStringTableCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/DumpStringTableCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ExtendedMethodFlagInfoCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ExtendedMethodFlagInfoCommand.java index b64f9cc31ef..88de4db7d9e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ExtendedMethodFlagInfoCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ExtendedMethodFlagInfoCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllModulesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllModulesCommand.java index 4b90a9d5e36..e532c37c01f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllModulesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllModulesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllReadsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllReadsCommand.java index 54903a31953..279912df200 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllReadsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindAllReadsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindMethodFromPcCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindMethodFromPcCommand.java index d3118e89189..1fe1ca0f0bd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindMethodFromPcCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindMethodFromPcCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModuleByNameCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModuleByNameCommand.java index 83817a3cc42..97bb07fbd8a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModuleByNameCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModuleByNameCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModulesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModulesCommand.java index c2a30712c46..302b9550313 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModulesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindModulesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindOverlappingSegmentsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindOverlappingSegmentsCommand.java index b472d910922..33453e274d1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindOverlappingSegmentsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindOverlappingSegmentsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindPatternCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindPatternCommand.java index c0450d1cde4..f8108bcd603 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindPatternCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindPatternCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindStackValueCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindStackValueCommand.java index 31f562e95ba..548b50c4e3f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindStackValueCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindStackValueCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindVMCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindVMCommand.java index 19ab5d00149..38ec2545c14 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindVMCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FindVMCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FlatObjectCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FlatObjectCommand.java index 926736e2564..b14b817e98e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FlatObjectCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/FlatObjectCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/GCCheckCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/GCCheckCommand.java index 82878c5b8dd..1a65d64c4bb 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/GCCheckCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/GCCheckCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/HashCodeCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/HashCodeCommand.java index 8bae07c72b2..196f34894f0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/HashCodeCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/HashCodeCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ITableSizeCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ITableSizeCommand.java index bb9fe792c39..f2a9cee8549 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ITableSizeCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ITableSizeCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9BCUtil.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9BCUtil.java index 21d774669a7..38859b3c7c8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9BCUtil.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9BCUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ClassShapeCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ClassShapeCommand.java index b00c2445315..4405fd5c8f1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ClassShapeCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ClassShapeCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ConstantPoolCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ConstantPoolCommand.java index 44f7a68acc5..bb3478bccf5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ConstantPoolCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9ConstantPoolCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9MemTagCommands.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9MemTagCommands.java index 49462b8f5bc..84c9f2d39e0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9MemTagCommands.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9MemTagCommands.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9StaticsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9StaticsCommand.java index afc2a09a94e..71298f92098 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9StaticsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9StaticsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9VTablesCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9VTablesCommand.java index 67161bd61cd..fbf94a1aa13 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9VTablesCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/J9VTablesCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JextractCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JextractCommand.java index a5928245274..1c541bc653c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JextractCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JextractCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitMetadataFromPcCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitMetadataFromPcCommand.java index ba30b890067..1d56a017e58 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitMetadataFromPcCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitMetadataFromPcCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitstackCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitstackCommand.java index 91ca6b9d0ac..a4992f2b179 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitstackCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/JitstackCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/LocalMapCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/LocalMapCommand.java index 04bf5017d97..84e00262fba 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/LocalMapCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/LocalMapCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MarkMapCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MarkMapCommand.java index 94e745a2ee9..e16bb530e46 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MarkMapCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MarkMapCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MethodForNameCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MethodForNameCommand.java index 45ee7e4bc63..3fa9307cdb5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MethodForNameCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MethodForNameCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MonitorsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MonitorsCommand.java index c94344b2e08..de2cb4d5374 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MonitorsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/MonitorsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/NativeMemInfoCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/NativeMemInfoCommand.java index 9c28a421ad0..5480dfd9581 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/NativeMemInfoCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/NativeMemInfoCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectRefsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectRefsCommand.java index d40e5033dff..70d337be1ce 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectRefsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectRefsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectSizeInfo.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectSizeInfo.java index 1cd785e0079..7dc758f137a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectSizeInfo.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ObjectSizeInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/QueryRomClassCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/QueryRomClassCommand.java index 4088878b5e8..4f2ec8c3a5d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/QueryRomClassCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/QueryRomClassCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RamClassSummaryCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RamClassSummaryCommand.java index 8d799a475b0..201d21190fa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RamClassSummaryCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RamClassSummaryCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassForNameCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassForNameCommand.java index 41a00934138..8e38039448d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassForNameCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassForNameCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassSummaryCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassSummaryCommand.java index d3c35fd2d44..7537e02320a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassSummaryCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RomClassSummaryCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RootPathCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RootPathCommand.java index 0ea7c5bb3c3..a5bae710af0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RootPathCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RootPathCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RuntimeSettingsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RuntimeSettingsCommand.java index bdbcded3caa..1f9144bb3d8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RuntimeSettingsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/RuntimeSettingsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SearchStringTableCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SearchStringTableCommand.java index e4b0a15ed88..ec6db86e2e4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SearchStringTableCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SearchStringTableCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SegmentsUtil.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SegmentsUtil.java index 28abd2f34d9..005384088a4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SegmentsUtil.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SegmentsUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SetVMCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SetVMCommand.java index be5819620d7..372177b4855 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SetVMCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/SetVMCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShowDumpAgentsCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShowDumpAgentsCommand.java index 0bed916bc51..e830c892d73 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShowDumpAgentsCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShowDumpAgentsCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShrCCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShrCCommand.java index b50c31c8454..23393a46d9a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShrCCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ShrCCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackWalkCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackWalkCommand.java index 0bc4fe65158..3a77f0906b5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackWalkCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackWalkCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackmapCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackmapCommand.java index 9b081d35dbe..520107d7277 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackmapCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/StackmapCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TrPrintCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TrPrintCommand.java index aab5515e247..5372838e0fa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TrPrintCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TrPrintCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TraceConfigCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TraceConfigCommand.java index 8ef82642116..c660cbddd14 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TraceConfigCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/TraceConfigCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VMConstantPoolCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VMConstantPoolCommand.java index 8315ee56533..3ca2e8482d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VMConstantPoolCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VMConstantPoolCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ValidateTraceFreeQueueCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ValidateTraceFreeQueueCommand.java index ac0a831a77a..9ca4915b6fc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ValidateTraceFreeQueueCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/ValidateTraceFreeQueueCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VmCheckCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VmCheckCommand.java index 62324f2d0b2..c81db73dc71 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VmCheckCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/VmCheckCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkInternTableCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkInternTableCommand.java index 8398b4473ca..3cfca77bc4e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkInternTableCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkInternTableCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkJ9PoolCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkJ9PoolCommand.java index 287b356b501..a57a0f0d525 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkJ9PoolCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkJ9PoolCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkUtThreadDataCommand.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkUtThreadDataCommand.java index bafc22af3fb..4d0dbf63729 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkUtThreadDataCommand.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WalkUtThreadDataCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WildCard.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WildCard.java index 7fa74b1c374..2b3a1ab78d7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WildCard.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/commands/WildCard.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.commands; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/Check.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/Check.java index f350ff9d010..3c43a33462c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/Check.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/Check.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckBase.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckBase.java index 035b5acf9e9..80699521273 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckBase.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassHeap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassHeap.java index 09908129f57..71b254cf0c0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassHeap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassHeap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassLoaders.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassLoaders.java index c067aa4441e..c575c0e2fa6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassLoaders.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckClassLoaders.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckCycle.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckCycle.java index 61adc595408..8dd518f63f6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckCycle.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckCycle.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckElement.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckElement.java index e728eed5252..53acf4f358f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckElement.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckElement.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckEngine.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckEngine.java index 2deac0a57a6..29040242727 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckEngine.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckEngine.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckError.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckError.java index b2ee2336cb4..d262e390ebc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckError.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckError.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckFinalizableList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckFinalizableList.java index 4db9476e26b..69706851487 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckFinalizableList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckFinalizableList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIGlobalReferences.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIGlobalReferences.java index 192be69605b..94392167e3a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIGlobalReferences.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIGlobalReferences.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIWeakGlobalReferences.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIWeakGlobalReferences.java index b3e244a4f40..51f3d5e1852 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIWeakGlobalReferences.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJNIWeakGlobalReferences.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJVMTIObjectTagTables.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJVMTIObjectTagTables.java index 8e4d2767124..a2c23b1a393 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJVMTIObjectTagTables.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckJVMTIObjectTagTables.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckMonitorTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckMonitorTable.java index f2d8cbda6ea..16234c6b43f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckMonitorTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckMonitorTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckObjectHeap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckObjectHeap.java index 36c45440e8d..152b6244987 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckObjectHeap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckObjectHeap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckOwnableSynchronizerList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckOwnableSynchronizerList.java index 6f8259cb302..ff3b81b243a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckOwnableSynchronizerList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckOwnableSynchronizerList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckRememberedSet.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckRememberedSet.java index 4e497397121..19a86d149e8 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckRememberedSet.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckRememberedSet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporter.java index 32880aad3a5..7f64c55e842 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporterTTY.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporterTTY.java index 342b96e8818..e75df887947 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporterTTY.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckReporterTTY.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckStringTable.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckStringTable.java index 69152244d6a..2f7e7b7591f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckStringTable.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckStringTable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckUnfinalizedList.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckUnfinalizedList.java index 83bc512668c..eccdd02b14b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckUnfinalizedList.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckUnfinalizedList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMClassSlots.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMClassSlots.java index 70f8799ac64..60d25e45fbe 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMClassSlots.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMClassSlots.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreadStacks.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreadStacks.java index f7c461a73be..de898daeec6 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreadStacks.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreadStacks.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreads.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreads.java index 0c70b7cb211..0d42a0a1433 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreads.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/CheckVMThreads.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/GCCheckRunner.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/GCCheckRunner.java index 58f724d65a9..747310296ce 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/GCCheckRunner.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/GCCheckRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/ScanFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/ScanFormatter.java index 6c26d537634..5d507da9292 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/ScanFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/ScanFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/SegmentTree.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/SegmentTree.java index 41f38ac6806..64bc1054b88 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/SegmentTree.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/gccheck/SegmentTree.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.gccheck; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockDetector.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockDetector.java index 4bb48b1f518..4eb2c9d8a59 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockDetector.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockDetector.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.monitors; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockUtils.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockUtils.java index dfa817da6e4..419b61f6afa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockUtils.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/DeadlockUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.monitors; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/JavaDeadlockGraphNode.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/JavaDeadlockGraphNode.java index c62bcfa3b54..9ead84db454 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/JavaDeadlockGraphNode.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/JavaDeadlockGraphNode.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.monitors; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/NativeDeadlockGraphNode.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/NativeDeadlockGraphNode.java index 76373c5a734..28c326848a5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/NativeDeadlockGraphNode.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/monitors/NativeDeadlockGraphNode.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.monitors; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ArrayFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ArrayFormatter.java index a862d65f046..63893977ced 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ArrayFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ArrayFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/BoolFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/BoolFormatter.java index 122431faf91..dc1de546a76 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/BoolFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/BoolFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/DoubleFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/DoubleFormatter.java index 55b95fb590f..f88a524bcfd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/DoubleFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/DoubleFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/EnumFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/EnumFormatter.java index a91068a8c8b..e64fd68a108 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/EnumFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/EnumFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/FloatFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/FloatFormatter.java index 9e5adac9394..b617052e3f1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/FloatFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/FloatFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/J9SRPFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/J9SRPFormatter.java index 65874da5eda..c13c6e38e0d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/J9SRPFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/J9SRPFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/PointerFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/PointerFormatter.java index 7b2651cc28a..d7a032be1d0 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/PointerFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/PointerFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ScalarFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ScalarFormatter.java index 042dee1fd0c..26b8f50ac98 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ScalarFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/ScalarFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructureFormatter.java index 62dfb897a4a..7f560006cff 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructurePointerFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructurePointerFormatter.java index eb65b938e0f..4eb41b9eaf5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructurePointerFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/StructurePointerFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/U64ScalarFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/U64ScalarFormatter.java index c55ade78b20..373653a963d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/U64ScalarFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/U64ScalarFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/VoidFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/VoidFormatter.java index 1fdc4d134b0..95691ccdb45 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/VoidFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/base/VoidFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.base; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/CStringFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/CStringFieldFormatter.java index 7acb33cf155..aaa7110d82f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/CStringFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/CStringFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassFieldFormatter.java index 8964c641921..1a4d240f81e 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassStructureFormatter.java index b888ec6108f..628e8065235 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ClassStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ConstantPoolFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ConstantPoolFieldFormatter.java index 316360c5ad6..8fcc2be0c20 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ConstantPoolFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ConstantPoolFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodFieldFormatter.java index e606ab29a81..79e30f61172 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodStructureFormatter.java index 0357965f41c..026207162cf 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9MethodStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ModuleStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ModuleStructureFormatter.java index 3ff6a0cb058..6bff2ff0cec 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ModuleStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ModuleStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectFieldFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectFieldFormatter.java index 49aca829e3e..41bea078d19 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectFieldFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectFieldFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectStructureFormatter.java index dd0e2867357..2eff6a4e95c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ObjectStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9PackageStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9PackageStructureFormatter.java index a49f419d097..95e856254c1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9PackageStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9PackageStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ROMMethodStructureFormatter.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ROMMethodStructureFormatter.java index f065698bec3..9555ebe9080 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ROMMethodStructureFormatter.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/tools/ddrinteractive/structureformat/extensions/J9ROMMethodStructureFormatter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.tools.ddrinteractive.structureformat.extensions; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I16.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I16.java index e00754089ad..7b63ae63e6d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I16.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I32.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I32.java index f93bc2c1b9d..8daefcb7bfc 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I32.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I32.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I64.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I64.java index a75d664d06e..3b991ec1de1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I64.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I64.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I8.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I8.java index 02198df4cb3..edcadc2ed56 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I8.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/I8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IDATA.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IDATA.java index a72f31dd69c..0e01ea011d4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IDATA.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IDATA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IScalar.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IScalar.java index 3f3e6f89759..0309289cfbd 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IScalar.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/IScalar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Scalar.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Scalar.java index 24ddcfb75fc..6e46d1cdc06 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Scalar.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Scalar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U16.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U16.java index d5197d33047..3855cfd9c05 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U16.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U32.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U32.java index 656002c0935..4bde5df9f8a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U32.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U32.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U64.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U64.java index f864808e781..3ae4602d949 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U64.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U64.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U8.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U8.java index 1fe4c035675..eaee80b9faa 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U8.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/U8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UDATA.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UDATA.java index 117a7cddaf6..3cf451b4b9b 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UDATA.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UDATA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UScalar.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UScalar.java index 6eb57c0a34c..b7575b75ea1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UScalar.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/UScalar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Void.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Void.java index 2aa0f10c656..b229ac32193 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Void.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/types/Void.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.types; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJBootstrapShim.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJBootstrapShim.java index 96051337b69..9cad99330e5 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJBootstrapShim.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJBootstrapShim.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJContext.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJContext.java index 24f2ee786ec..5c302da4180 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJContext.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/DTFJContext.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/J9RASInfoBootstrapShim.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/J9RASInfoBootstrapShim.java index 20b398de264..7b41c2bb94a 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/J9RASInfoBootstrapShim.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/J9RASInfoBootstrapShim.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJGenericJavaRuntimeMemorySection.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJGenericJavaRuntimeMemorySection.java index b8fb600cfb0..5d2963b0987 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJGenericJavaRuntimeMemorySection.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJGenericJavaRuntimeMemorySection.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java index 13df42c78cd..4d0072ba9c7 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClassloader.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClassloader.java index 3bbb83ed6cd..79942adf049 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClassloader.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaClassloader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaField.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaField.java index e5074f38304..bcc4501f3a3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaField.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldInstance.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldInstance.java index c845e7c5090..68f0a22b681 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldInstance.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldInstance.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldStatic.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldStatic.java index 5bba5e6115a..939308b1974 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldStatic.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaFieldStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaHeap.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaHeap.java index 64b44184782..3a1fd456b19 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaHeap.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaHeap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaMethod.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaMethod.java index 262ac1f44df..6ba0e202346 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaMethod.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObject.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObject.java index 7c466b0dea5..754ea7055d3 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObject.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObjectMonitor.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObjectMonitor.java index b23bd6392cc..2e06367d3af 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObjectMonitor.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaObjectMonitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaReference.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaReference.java index 9c24b28d4a7..0a2b21870e1 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaReference.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaReference.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntime.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntime.java index d42c715f460..311df8a8ed4 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntime.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemoryCategory.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemoryCategory.java index 7753649014b..3b7e725786f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemoryCategory.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemoryCategory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemorySectionBase.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemorySectionBase.java index 5c65e7dab19..44e635ebe7d 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemorySectionBase.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaRuntimeMemorySectionBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaStackFrame.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaStackFrame.java index 9f0a8c4932d..3808ee0c739 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaStackFrame.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaStackFrame.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaSystemMonitor.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaSystemMonitor.java index 5781de45396..b004992d37c 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaSystemMonitor.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaSystemMonitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaThread.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaThread.java index 1ea63da67e3..c78cba16192 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaThread.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMInitArgs.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMInitArgs.java index fe1a0ff4c95..76dba19904f 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMInitArgs.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMInitArgs.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMOption.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMOption.java index 2b6d5496f3f..679a151a410 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMOption.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJJavaVMOption.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJMemoryTagRuntimeMemorySection.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJMemoryTagRuntimeMemorySection.java index 5d57cd7709f..538f59f0bc9 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJMemoryTagRuntimeMemorySection.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/DTFJMemoryTagRuntimeMemorySection.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/AddCorruptionToListListener.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/AddCorruptionToListListener.java index 2d6816ab830..7d61839c449 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/AddCorruptionToListListener.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/AddCorruptionToListListener.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java.corrupt; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/CorruptJavaObject.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/CorruptJavaObject.java index 1850ec7a444..aaed2ff1938 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/CorruptJavaObject.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/corrupt/CorruptJavaObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java.corrupt; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJConstantPoolIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJConstantPoolIterator.java index 4bd8cde9390..e599ae2fd01 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJConstantPoolIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJConstantPoolIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJMonitorIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJMonitorIterator.java index 55759eb4d8a..d0fde9370c2 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJMonitorIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/DTFJMonitorIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/HeapObjectIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/HeapObjectIterator.java index 10ecbeb1be5..60e1a155b68 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/HeapObjectIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/HeapObjectIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java.j9; diff --git a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/SlidingIterator.java b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/SlidingIterator.java index ac6096928dd..55eef6d5850 100644 --- a/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/SlidingIterator.java +++ b/debugtools/DDR_VM/src/com/ibm/j9ddr/vm29/view/dtfj/java/j9/SlidingIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.vm29.view.dtfj.java.j9; diff --git a/debugtools/DDR_VM/test.xml b/debugtools/DDR_VM/test.xml index 08130fd68c9..13470545184 100644 --- a/debugtools/DDR_VM/test.xml +++ b/debugtools/DDR_VM/test.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/debugtools/DDR_VM/testsrc/DTFJKickTyres.java b/debugtools/DDR_VM/testsrc/DTFJKickTyres.java index a3a44b9f454..afaa7f195ee 100644 --- a/debugtools/DDR_VM/testsrc/DTFJKickTyres.java +++ b/debugtools/DDR_VM/testsrc/DTFJKickTyres.java @@ -32,7 +32,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/debugtools/DDR_VM/testsrc/DumpImageMemoryRanges.java b/debugtools/DDR_VM/testsrc/DumpImageMemoryRanges.java index b49db473386..ca18d1c3a88 100644 --- a/debugtools/DDR_VM/testsrc/DumpImageMemoryRanges.java +++ b/debugtools/DDR_VM/testsrc/DumpImageMemoryRanges.java @@ -30,7 +30,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/debugtools/DDR_VM/testsrc/PrintBlob.java b/debugtools/DDR_VM/testsrc/PrintBlob.java index 2af8d97b36d..d3720d318bf 100644 --- a/debugtools/DDR_VM/testsrc/PrintBlob.java +++ b/debugtools/DDR_VM/testsrc/PrintBlob.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/bootstrap/common/CTypeParserTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/bootstrap/common/CTypeParserTest.java index 1ca8456bbc3..5d440239a14 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/bootstrap/common/CTypeParserTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/bootstrap/common/CTypeParserTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.bootstrap.common; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/BaseMockMemoryRange.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/BaseMockMemoryRange.java index 62b7ed95b78..aaa1ecf2ec8 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/BaseMockMemoryRange.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/BaseMockMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/DumpSegments.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/DumpSegments.java index 4b419536f04..874f8398ca3 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/DumpSegments.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/DumpSegments.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAbstractMemory.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAbstractMemory.java index 14a4849bfa4..dc819f76142 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAbstractMemory.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAbstractMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAddresses.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAddresses.java index 3890a52c914..fa4cb955948 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAddresses.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestAddresses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestComparableMemoryRange.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestComparableMemoryRange.java index a473f31d2ca..764f5ad54fe 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestComparableMemoryRange.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestComparableMemoryRange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestIMemoryImageInputStream.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestIMemoryImageInputStream.java index 486d030b9a4..c255990feb7 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestIMemoryImageInputStream.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/corereaders/memory/TestIMemoryImageInputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.corereaders.memory; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/dtfj/tck/ImageCreator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/dtfj/tck/ImageCreator.java index df5b2d1d365..e482bb60104 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/dtfj/tck/ImageCreator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/dtfj/tck/ImageCreator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.dtfj.tck; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/junit/framework/BootstrapJUnitTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/junit/framework/BootstrapJUnitTest.java index 76bd5eb7f34..d4a878e948d 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/junit/framework/BootstrapJUnitTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/junit/framework/BootstrapJUnitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.junit.framework; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/structures/generated/mock/runtime/TestBitfield.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/structures/generated/mock/runtime/TestBitfield.java index 730912ec7ca..6d1bf6174e0 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/structures/generated/mock/runtime/TestBitfield.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/structures/generated/mock/runtime/TestBitfield.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.structures.generated.mock.runtime; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/core/DDRTestLauncher.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/core/DDRTestLauncher.java index 17cade52481..af50b7b9ffb 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/core/DDRTestLauncher.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/core/DDRTestLauncher.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.ArrayList; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp1.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp1.java index 40fc63da0b2..fd7665431f3 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp1.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.test.stackwalker.testapp; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2.java index 88c716cbeb2..b764396247b 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.test.stackwalker.testapp; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2_2.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2_2.java index 66a80aeb87a..c9d98251546 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2_2.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp2_2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.test.stackwalker.testapp; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp3.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp3.java index 074c9a66ce5..2d6d3d3abb9 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp3.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/test/stackwalker/testapp/TestApp3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.test.stackwalker.testapp; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/ant/JUnitResultsSummary.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/ant/JUnitResultsSummary.java index cde1696fd06..b499f5e81df 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/ant/JUnitResultsSummary.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/ant/JUnitResultsSummary.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ant; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/store/test/J9DDRStructureStoreTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/store/test/J9DDRStructureStoreTest.java index da3a755ad1c..756ce2efed5 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/store/test/J9DDRStructureStoreTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/store/test/J9DDRStructureStoreTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.store.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapSectionUnitTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapSectionUnitTest.java index 2a4f6cebeab..79f71db0651 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapSectionUnitTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapSectionUnitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.xml; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapUnitTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapUnitTest.java index 86c99157716..2fe5a86abb3 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapUnitTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJHeapUnitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.xml; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJTest.java index 80bd2e3a692..1d40851b744 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/DTFJTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.xml; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/XMLComparisonUnitTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/XMLComparisonUnitTest.java index a85e817aa60..1d9342e2273 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/XMLComparisonUnitTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/XMLComparisonUnitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.xml; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/jextract/JExtractXMLGenerator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/jextract/JExtractXMLGenerator.java index 1df7dca5df2..2569bcf4e28 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/jextract/JExtractXMLGenerator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/tools/xml/jextract/JExtractXMLGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.xml.jextract; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/CorruptDataComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/CorruptDataComparator.java index a13e1aefbe5..f265c01486f 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/CorruptDataComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/CorruptDataComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageAddressSpaceComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageAddressSpaceComparator.java index 4b1c47156d9..5aa960a50d8 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageAddressSpaceComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageAddressSpaceComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageComparator.java index 9d3c29e4e82..30ed7504b8b 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageModuleComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageModuleComparator.java index 7839015ff96..c230f219ff5 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageModuleComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageModuleComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImagePointerComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImagePointerComparator.java index 0677cf1bdf5..572c25014b5 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImagePointerComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImagePointerComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageProcessComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageProcessComparator.java index baf37ee6454..a74b258a17d 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageProcessComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageProcessComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageRegisterComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageRegisterComparator.java index bafe62f5bb4..c78b605deab 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageRegisterComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageRegisterComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSectionComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSectionComparator.java index 9a410009097..a4f9b8ce69b 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSectionComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSectionComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageStackFrameComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageStackFrameComparator.java index 20a85e2ea99..24ba8790276 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageStackFrameComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageStackFrameComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSymbolComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSymbolComparator.java index 739b31bdb2e..8c7baa84090 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSymbolComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageSymbolComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageThreadComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageThreadComparator.java index af2e0b4ce9b..9698a4008b5 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageThreadComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ImageThreadComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassComparator.java index 46f22279348..f0d4df136db 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassLoaderComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassLoaderComparator.java index 4a76ae67128..f75faa46add 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassLoaderComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaClassLoaderComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaFieldComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaFieldComparator.java index 01d153cfb5d..7c39c38a9dc 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaFieldComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaFieldComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaHeapComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaHeapComparator.java index 5b71d0753cb..6534f16bd02 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaHeapComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaHeapComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaLocationComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaLocationComparator.java index ef96770c2cd..b14c786cb3d 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaLocationComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaLocationComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMethodComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMethodComparator.java index 457468b3949..c5f506a8247 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMethodComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMethodComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMonitorComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMonitorComparator.java index 7379dc2af69..219ac1b9558 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMonitorComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaMonitorComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaObjectComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaObjectComparator.java index fd8c0cd3783..e08933ed970 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaObjectComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaObjectComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaReferenceComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaReferenceComparator.java index debe62bcf9e..677389d0c93 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaReferenceComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaReferenceComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaRuntimeComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaRuntimeComparator.java index c900455f9d5..cecf3ce3e0b 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaRuntimeComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaRuntimeComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaStackFrameComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaStackFrameComparator.java index 460994659b4..af582abda41 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaStackFrameComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaStackFrameComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaThreadComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaThreadComparator.java index 9a7ca37be20..9e016325fa4 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaThreadComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaThreadComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMInitArgsComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMInitArgsComparator.java index 61d59cd4ea4..ebdc5a0a05b 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMInitArgsComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMInitArgsComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMOptionComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMOptionComparator.java index 7103d291e57..3dc9750a718 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMOptionComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/JavaVMOptionComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ManagedRuntimeComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ManagedRuntimeComparator.java index 71d0bdfbd26..af02452b8e1 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ManagedRuntimeComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/ManagedRuntimeComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/StringComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/StringComparator.java index d92b3ae93f1..db9254574ad 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/StringComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/comparators/StringComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.comparators; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJComparator.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJComparator.java index ed2b4a623c7..70cae8ec244 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJComparator.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJComparator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJUnitTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJUnitTest.java index 32f9deb784a..01c9d221450 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJUnitTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/DTFJUnitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageAddressSpaceTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageAddressSpaceTest.java index 54d66fb9dbe..83109a51d01 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageAddressSpaceTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageAddressSpaceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageFactoryTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageFactoryTest.java index 98e284b1ca8..45a4ac72efb 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageFactoryTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageFactoryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageModuleTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageModuleTest.java index d1fbe806360..0ece58cce31 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageModuleTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageModuleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImagePointerTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImagePointerTest.java index d4224513589..929f585290c 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImagePointerTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImagePointerTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageProcessTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageProcessTest.java index b526e480589..74b175e33c9 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageProcessTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageProcessTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageRegisterTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageRegisterTest.java index 11d9c5de694..6197ee8a812 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageRegisterTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageRegisterTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSectionTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSectionTest.java index caee890e6ff..80111519b44 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSectionTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSectionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageStackFrameTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageStackFrameTest.java index 47aa1e2b0d6..ca662607bcb 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageStackFrameTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageStackFrameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSymbolTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSymbolTest.java index 1ab5a146059..ebf11193b52 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSymbolTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageSymbolTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageTest.java index d066a90af5e..9883185d0a4 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageThreadTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageThreadTest.java index e9ac37e50dc..9cf965e9f0e 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageThreadTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ImageThreadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassLoaderTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassLoaderTest.java index f9404508776..166716a43f8 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassLoaderTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassLoaderTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassTest.java index 0c8bbdcae4f..ad68cc42bce 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaFieldTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaFieldTest.java index 636c3785d86..debec698f13 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaFieldTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaFieldTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaHeapTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaHeapTest.java index c47605539de..27237f0d46c 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaHeapTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaHeapTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaLocationTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaLocationTest.java index 9d79484c542..a063351f9f1 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaLocationTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaLocationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMethodTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMethodTest.java index dd2cc7e84b4..3ad04abb7d9 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMethodTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMethodTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMonitorTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMonitorTest.java index 25ce1831d1c..0db0b9a767a 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMonitorTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaMonitorTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaObjectTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaObjectTest.java index 2d2f0239dfd..d1c6c73087b 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaObjectTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaObjectTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaReferenceTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaReferenceTest.java index 6e98f006599..766c69423af 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaReferenceTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaReferenceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaRuntimeTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaRuntimeTest.java index f02aeda9f2a..c7efb7983fc 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaRuntimeTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaRuntimeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaStackFrameTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaStackFrameTest.java index 4e921f1397c..6c0fab6a3d0 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaStackFrameTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaStackFrameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaThreadTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaThreadTest.java index a70afa2a8d7..9d0e477ee1a 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaThreadTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaThreadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMInitArgsTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMInitArgsTest.java index e0ff7767d64..e0a76b6e7d9 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMInitArgsTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMInitArgsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMOptionTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMOptionTest.java index dc3901a2d30..bb141d0e94e 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMOptionTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/JavaVMOptionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ManagedRuntimeTest.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ManagedRuntimeTest.java index 93311a0f7dc..b1a7d36100f 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ManagedRuntimeTest.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/ManagedRuntimeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/TestUtil.java b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/TestUtil.java index a258aa5c49d..36b599d430e 100644 --- a/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/TestUtil.java +++ b/debugtools/DDR_VM/testsrc/com/ibm/j9ddr/view/dtfj/test/TestUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.view.dtfj.test; diff --git a/debugtools/DDR_VM/zos_address_space_packer/multi_as.c b/debugtools/DDR_VM/zos_address_space_packer/multi_as.c index ad972959843..2f9b9c83ae9 100644 --- a/debugtools/DDR_VM/zos_address_space_packer/multi_as.c +++ b/debugtools/DDR_VM/zos_address_space_packer/multi_as.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/debugtools/DDR_VM/zos_address_space_packer/readme.txt b/debugtools/DDR_VM/zos_address_space_packer/readme.txt index df88648da59..cd0baaba635 100644 --- a/debugtools/DDR_VM/zos_address_space_packer/readme.txt +++ b/debugtools/DDR_VM/zos_address_space_packer/readme.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 zOS Address Space Packer diff --git a/doc/GuideForCommitters.md b/doc/GuideForCommitters.md index 83e50a0c2df..09ab1ecb857 100644 --- a/doc/GuideForCommitters.md +++ b/doc/GuideForCommitters.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/doc/README.md b/doc/README.md index 590e1423277..c2dbff15269 100644 --- a/doc/README.md +++ b/doc/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/doc/build-instructions/Build_Compiler_Only.md b/doc/build-instructions/Build_Compiler_Only.md index 4c6ec3355b2..5a5e06132c9 100644 --- a/doc/build-instructions/Build_Compiler_Only.md +++ b/doc/build-instructions/Build_Compiler_Only.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # How to build only the Compiler component diff --git a/doc/build-instructions/Build_Instructions_V11.md b/doc/build-instructions/Build_Instructions_V11.md index 7c8bd70f699..b5c1b79cc0c 100644 --- a/doc/build-instructions/Build_Instructions_V11.md +++ b/doc/build-instructions/Build_Instructions_V11.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Building OpenJDK Version 11 with OpenJ9 diff --git a/doc/build-instructions/Build_Instructions_V17.md b/doc/build-instructions/Build_Instructions_V17.md index 485551521aa..0f8f1ed68e6 100644 --- a/doc/build-instructions/Build_Instructions_V17.md +++ b/doc/build-instructions/Build_Instructions_V17.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Building OpenJDK Version 17 with OpenJ9 diff --git a/doc/build-instructions/Build_Instructions_V19.md b/doc/build-instructions/Build_Instructions_V19.md index 7b3e416f11f..fa0a0fdcc67 100644 --- a/doc/build-instructions/Build_Instructions_V19.md +++ b/doc/build-instructions/Build_Instructions_V19.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Building OpenJDK Version 19 with OpenJ9 diff --git a/doc/build-instructions/Build_Instructions_V20.md b/doc/build-instructions/Build_Instructions_V20.md index 4c67ddc461d..ccd376579df 100644 --- a/doc/build-instructions/Build_Instructions_V20.md +++ b/doc/build-instructions/Build_Instructions_V20.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Building OpenJDK Version 20 with OpenJ9 diff --git a/doc/build-instructions/Build_Instructions_V8.md b/doc/build-instructions/Build_Instructions_V8.md index 493bfcbaac5..cc40f24a172 100644 --- a/doc/build-instructions/Build_Instructions_V8.md +++ b/doc/build-instructions/Build_Instructions_V8.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Building OpenJDK Version 8 with OpenJ9 diff --git a/doc/build-instructions/cmake.md b/doc/build-instructions/cmake.md index 883eccb5dfd..b99c4ecdd3e 100644 --- a/doc/build-instructions/cmake.md +++ b/doc/build-instructions/cmake.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # CMake Getting Started / FAQ diff --git a/doc/compiler/README.md b/doc/compiler/README.md index 9e560f80749..186798b3834 100644 --- a/doc/compiler/README.md +++ b/doc/compiler/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ## Table of Contents diff --git a/doc/compiler/aot/AddingNewRelocation.md b/doc/compiler/aot/AddingNewRelocation.md index 01e5cd2a349..37e5149c55e 100644 --- a/doc/compiler/aot/AddingNewRelocation.md +++ b/doc/compiler/aot/AddingNewRelocation.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> The relocation infrastructure contains a lot of boilerplate; as such there diff --git a/doc/compiler/aot/ClassChains.md b/doc/compiler/aot/ClassChains.md index edf8390d94c..181d42d6a64 100644 --- a/doc/compiler/aot/ClassChains.md +++ b/doc/compiler/aot/ClassChains.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # AOT Class Chains diff --git a/doc/compiler/aot/Diagnostics.md b/doc/compiler/aot/Diagnostics.md index 142af9493cc..71477536dba 100644 --- a/doc/compiler/aot/Diagnostics.md +++ b/doc/compiler/aot/Diagnostics.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/aot/InlinedMethods.md b/doc/compiler/aot/InlinedMethods.md index 280ae8e06ac..83b0643859a 100644 --- a/doc/compiler/aot/InlinedMethods.md +++ b/doc/compiler/aot/InlinedMethods.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/aot/README.md b/doc/compiler/aot/README.md index 4869b0708f0..bb7f08ef1b2 100644 --- a/doc/compiler/aot/README.md +++ b/doc/compiler/aot/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/aot/RelocationRecords.md b/doc/compiler/aot/RelocationRecords.md index 3f61064a3f5..7462608ee91 100644 --- a/doc/compiler/aot/RelocationRecords.md +++ b/doc/compiler/aot/RelocationRecords.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> This document describes at a high level what the various relocation records diff --git a/doc/compiler/aot/SymbolValidationManager.md b/doc/compiler/aot/SymbolValidationManager.md index fc907180823..b48b45a2044 100644 --- a/doc/compiler/aot/SymbolValidationManager.md +++ b/doc/compiler/aot/SymbolValidationManager.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Symbol Validation Manager diff --git a/doc/compiler/concepts/JitWriteBarriers.md b/doc/compiler/concepts/JitWriteBarriers.md index 68837ffaea2..1fec040f800 100644 --- a/doc/compiler/concepts/JitWriteBarriers.md +++ b/doc/compiler/concepts/JitWriteBarriers.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JIT Write Barriers diff --git a/doc/compiler/control/CompilationControl.md b/doc/compiler/control/CompilationControl.md index 020d43c8cd1..87943cf4a7b 100644 --- a/doc/compiler/control/CompilationControl.md +++ b/doc/compiler/control/CompilationControl.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/control/OptionsPostRestore.md b/doc/compiler/control/OptionsPostRestore.md index 49a309ff985..6de9edfd12c 100644 --- a/doc/compiler/control/OptionsPostRestore.md +++ b/doc/compiler/control/OptionsPostRestore.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/control/OptionsProcessing.md b/doc/compiler/control/OptionsProcessing.md index 234b0256a4e..cb403fff122 100644 --- a/doc/compiler/control/OptionsProcessing.md +++ b/doc/compiler/control/OptionsProcessing.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/hcr/NextGenHCR.md b/doc/compiler/hcr/NextGenHCR.md index 89ef749701b..e50d5be971c 100644 --- a/doc/compiler/hcr/NextGenHCR.md +++ b/doc/compiler/hcr/NextGenHCR.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/il/IL_FAQ.md b/doc/compiler/il/IL_FAQ.md index ff839883479..58a6a60f771 100644 --- a/doc/compiler/il/IL_FAQ.md +++ b/doc/compiler/il/IL_FAQ.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Overview diff --git a/doc/compiler/jitserver/Build.md b/doc/compiler/jitserver/Build.md index 2fe2c1506df..e98be9132f6 100644 --- a/doc/compiler/jitserver/Build.md +++ b/doc/compiler/jitserver/Build.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Building JITServer diff --git a/doc/compiler/jitserver/CHTable.md b/doc/compiler/jitserver/CHTable.md index 7c3d36f6488..c83e2bca33a 100644 --- a/doc/compiler/jitserver/CHTable.md +++ b/doc/compiler/jitserver/CHTable.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer CHTable design and implementation diff --git a/doc/compiler/jitserver/Caching.md b/doc/compiler/jitserver/Caching.md index 648a9ce8429..4bf73bb6b64 100644 --- a/doc/compiler/jitserver/Caching.md +++ b/doc/compiler/jitserver/Caching.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Caching in JITServer diff --git a/doc/compiler/jitserver/ClientSession.md b/doc/compiler/jitserver/ClientSession.md index 8d4c2ec7c70..b51d910a46a 100644 --- a/doc/compiler/jitserver/ClientSession.md +++ b/doc/compiler/jitserver/ClientSession.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Client Sessions diff --git a/doc/compiler/jitserver/Frontend.md b/doc/compiler/jitserver/Frontend.md index 5de201eaa23..b37f3394ef6 100644 --- a/doc/compiler/jitserver/Frontend.md +++ b/doc/compiler/jitserver/Frontend.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Front-end diff --git a/doc/compiler/jitserver/IProfiler.md b/doc/compiler/jitserver/IProfiler.md index d0c7df17936..4a453ab5b20 100644 --- a/doc/compiler/jitserver/IProfiler.md +++ b/doc/compiler/jitserver/IProfiler.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Interpreter Profiler diff --git a/doc/compiler/jitserver/Memory.md b/doc/compiler/jitserver/Memory.md index 5b7c2438288..4e15202a396 100644 --- a/doc/compiler/jitserver/Memory.md +++ b/doc/compiler/jitserver/Memory.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Memory Model diff --git a/doc/compiler/jitserver/Messaging.md b/doc/compiler/jitserver/Messaging.md index 79110a666e2..65f9bfbb0b5 100644 --- a/doc/compiler/jitserver/Messaging.md +++ b/doc/compiler/jitserver/Messaging.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Messaging Protocol diff --git a/doc/compiler/jitserver/Networking.md b/doc/compiler/jitserver/Networking.md index ed98c8a4bac..db541c8c898 100644 --- a/doc/compiler/jitserver/Networking.md +++ b/doc/compiler/jitserver/Networking.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Networking diff --git a/doc/compiler/jitserver/OptionsDev.md b/doc/compiler/jitserver/OptionsDev.md index d8a63a34ea3..b8b43bfb066 100644 --- a/doc/compiler/jitserver/OptionsDev.md +++ b/doc/compiler/jitserver/OptionsDev.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Options Handling diff --git a/doc/compiler/jitserver/Overview.md b/doc/compiler/jitserver/Overview.md index df8e5d28738..65006c9a7f3 100644 --- a/doc/compiler/jitserver/Overview.md +++ b/doc/compiler/jitserver/Overview.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Overview diff --git a/doc/compiler/jitserver/Problem.md b/doc/compiler/jitserver/Problem.md index ee581bbae93..34b7eaadc77 100644 --- a/doc/compiler/jitserver/Problem.md +++ b/doc/compiler/jitserver/Problem.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Debugging JITServer diff --git a/doc/compiler/jitserver/README.md b/doc/compiler/jitserver/README.md index 479d7ef8b3d..46a829d4655 100644 --- a/doc/compiler/jitserver/README.md +++ b/doc/compiler/jitserver/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # JITServer Documentation diff --git a/doc/compiler/jitserver/ResolvedMethod.md b/doc/compiler/jitserver/ResolvedMethod.md index e0c385d3cf0..6a40736433c 100644 --- a/doc/compiler/jitserver/ResolvedMethod.md +++ b/doc/compiler/jitserver/ResolvedMethod.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Resolved Methods diff --git a/doc/compiler/jitserver/Testing.md b/doc/compiler/jitserver/Testing.md index 50554fe3ab8..e6fba7f900f 100644 --- a/doc/compiler/jitserver/Testing.md +++ b/doc/compiler/jitserver/Testing.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Testing JITServer diff --git a/doc/compiler/jitserver/Usage.md b/doc/compiler/jitserver/Usage.md index 22bf615b880..8bbb066fd88 100644 --- a/doc/compiler/jitserver/Usage.md +++ b/doc/compiler/jitserver/Usage.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Getting started with JITServer diff --git a/doc/compiler/jprofiling/JProfiling.md b/doc/compiler/jprofiling/JProfiling.md index 0127d744bfa..dbdd2ea952d 100644 --- a/doc/compiler/jprofiling/JProfiling.md +++ b/doc/compiler/jprofiling/JProfiling.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Value JProfiling diff --git a/doc/compiler/memory/MemoryManager.md b/doc/compiler/memory/MemoryManager.md index a20ca38b0c0..0af6a6e5200 100644 --- a/doc/compiler/memory/MemoryManager.md +++ b/doc/compiler/memory/MemoryManager.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # OpenJ9 Compiler Memory Manager diff --git a/doc/compiler/misc/BestPractices.md b/doc/compiler/misc/BestPractices.md index bdba5d532ae..b76133f08b9 100644 --- a/doc/compiler/misc/BestPractices.md +++ b/doc/compiler/misc/BestPractices.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Compiler Best Practices diff --git a/doc/compiler/optimizer/ControlFlowOptimizationsSummary.md b/doc/compiler/optimizer/ControlFlowOptimizationsSummary.md index b39aa31dd8a..c78e6ca2006 100644 --- a/doc/compiler/optimizer/ControlFlowOptimizationsSummary.md +++ b/doc/compiler/optimizer/ControlFlowOptimizationsSummary.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Control Flow Optimizations diff --git a/doc/compiler/optimizer/EdoOptimization.md b/doc/compiler/optimizer/EdoOptimization.md index 587eca2c8ab..6a965601fdd 100644 --- a/doc/compiler/optimizer/EdoOptimization.md +++ b/doc/compiler/optimizer/EdoOptimization.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Mechanics of the Exception Directed Optimization (EDO) Optimization diff --git a/doc/compiler/optimizer/GlobalOptimizationsSummary.md b/doc/compiler/optimizer/GlobalOptimizationsSummary.md index 02965b19aaa..2e7c960669d 100644 --- a/doc/compiler/optimizer/GlobalOptimizationsSummary.md +++ b/doc/compiler/optimizer/GlobalOptimizationsSummary.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Global Optimizations diff --git a/doc/compiler/optimizer/LocalOptimizationsSummary.md b/doc/compiler/optimizer/LocalOptimizationsSummary.md index c6665071f47..39000f80754 100644 --- a/doc/compiler/optimizer/LocalOptimizationsSummary.md +++ b/doc/compiler/optimizer/LocalOptimizationsSummary.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Local Optimizations diff --git a/doc/compiler/optimizer/LoopOptimizationSummary.md b/doc/compiler/optimizer/LoopOptimizationSummary.md index 590950823a6..9eec26701cf 100644 --- a/doc/compiler/optimizer/LoopOptimizationSummary.md +++ b/doc/compiler/optimizer/LoopOptimizationSummary.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # [Loop Optimizations](https://github.com/eclipse/omr/blob/master/doc/compiler/optimizer/IntroLoopOptimizations.md) diff --git a/doc/compiler/optimizer/OptimizerDesignFeatures.md b/doc/compiler/optimizer/OptimizerDesignFeatures.md index eb75dd5ad5c..6fb0ea61935 100644 --- a/doc/compiler/optimizer/OptimizerDesignFeatures.md +++ b/doc/compiler/optimizer/OptimizerDesignFeatures.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Design Features in the OpenJ9 JIT Optimizer diff --git a/doc/compiler/optimizer/inlineFastPathLocations.md b/doc/compiler/optimizer/inlineFastPathLocations.md index 0a28bad7c24..c8fcbd50658 100644 --- a/doc/compiler/optimizer/inlineFastPathLocations.md +++ b/doc/compiler/optimizer/inlineFastPathLocations.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Different Inline Fast Path Optimization Locations diff --git a/doc/compiler/runtime/CodeCacheReclamation.md b/doc/compiler/runtime/CodeCacheReclamation.md index d47ca0d42c9..32ff0ec28a0 100644 --- a/doc/compiler/runtime/CodeCacheReclamation.md +++ b/doc/compiler/runtime/CodeCacheReclamation.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Background diff --git a/doc/compiler/runtime/ExceptionHandling.md b/doc/compiler/runtime/ExceptionHandling.md index 9b4128a8f1c..2848266ca77 100644 --- a/doc/compiler/runtime/ExceptionHandling.md +++ b/doc/compiler/runtime/ExceptionHandling.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Exception Handling diff --git a/doc/compiler/runtime/JITHooks.md b/doc/compiler/runtime/JITHooks.md index aecbd8cb8f9..fb3c3dd3857 100644 --- a/doc/compiler/runtime/JITHooks.md +++ b/doc/compiler/runtime/JITHooks.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Background diff --git a/doc/compiler/runtime/MetadataReclamation.md b/doc/compiler/runtime/MetadataReclamation.md index 42b09e3c469..03a5cdba1ce 100644 --- a/doc/compiler/runtime/MetadataReclamation.md +++ b/doc/compiler/runtime/MetadataReclamation.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Metadata Reclamation Design {#MetadataReclamation} diff --git a/doc/compiler/runtime/Recompilation.md b/doc/compiler/runtime/Recompilation.md index 986f54f4c09..5791545825c 100644 --- a/doc/compiler/runtime/Recompilation.md +++ b/doc/compiler/runtime/Recompilation.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Background diff --git a/doc/compiler/runtime/RuntimeAssumption.md b/doc/compiler/runtime/RuntimeAssumption.md index 6e6a3d35184..ecb78c4a89e 100644 --- a/doc/compiler/runtime/RuntimeAssumption.md +++ b/doc/compiler/runtime/RuntimeAssumption.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> **Runtime assumption framework** is a key component of the Testarossa JIT diff --git a/doc/diagnostics/AddingTracepoints.md b/doc/diagnostics/AddingTracepoints.md index b61b31f6f32..2f32e5b7ecc 100644 --- a/doc/diagnostics/AddingTracepoints.md +++ b/doc/diagnostics/AddingTracepoints.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Guidelines for adding `-Xtrace` tracepoints to OpenJ9 diff --git a/doc/diagnostics/CallingConventions.md b/doc/diagnostics/CallingConventions.md index 072da03b188..9b4ab70adaa 100644 --- a/doc/diagnostics/CallingConventions.md +++ b/doc/diagnostics/CallingConventions.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> This document describes the calling conventions for the JIT Private diff --git a/doc/diagnostics/VMState.md b/doc/diagnostics/VMState.md index 5e7ab8a0459..45c8f4672b4 100644 --- a/doc/diagnostics/VMState.md +++ b/doc/diagnostics/VMState.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # VM state diff --git a/doc/diagnostics/WritingDdrCode.md b/doc/diagnostics/WritingDdrCode.md index d9769bb1d30..9cf40180e87 100644 --- a/doc/diagnostics/WritingDdrCode.md +++ b/doc/diagnostics/WritingDdrCode.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Writing Java code for DDR diff --git a/doc/features/ObjectLockword.md b/doc/features/ObjectLockword.md index a3bc449453e..aab8ce5aeb9 100644 --- a/doc/features/ObjectLockword.md +++ b/doc/features/ObjectLockword.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Table of Contents diff --git a/doc/features/SharedClassesCache.md b/doc/features/SharedClassesCache.md index f2c73c06474..3331071c2fe 100644 --- a/doc/features/SharedClassesCache.md +++ b/doc/features/SharedClassesCache.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> The Shared Classes Cache (SCC) is a feature of OpenJ9 that enables sharing diff --git a/doc/processes/deprecation.md b/doc/processes/deprecation.md index ba1db5cf490..873303d870e 100644 --- a/doc/processes/deprecation.md +++ b/doc/processes/deprecation.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 Deprecation Process diff --git a/doc/processes/labels.md b/doc/processes/labels.md index 7eaceb37cae..b77264c5a16 100644 --- a/doc/processes/labels.md +++ b/doc/processes/labels.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 Issue Labels diff --git a/doc/processes/release_process.md b/doc/processes/release_process.md index e6fec922e0c..a81aec7bb82 100644 --- a/doc/processes/release_process.md +++ b/doc/processes/release_process.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 Release Process diff --git a/doc/release-notes/0.10/0.10.md b/doc/release-notes/0.10/0.10.md index f2d58b39f59..f302b5bf8f1 100644 --- a/doc/release-notes/0.10/0.10.md +++ b/doc/release-notes/0.10/0.10.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.10.0 release notes diff --git a/doc/release-notes/0.11/0.11.md b/doc/release-notes/0.11/0.11.md index 9102abcb7ed..518b2ac6bd8 100644 --- a/doc/release-notes/0.11/0.11.md +++ b/doc/release-notes/0.11/0.11.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.11.0 release notes diff --git a/doc/release-notes/0.12/0.12.1.md b/doc/release-notes/0.12/0.12.1.md index 924b2fb09a5..c93f3e0da32 100644 --- a/doc/release-notes/0.12/0.12.1.md +++ b/doc/release-notes/0.12/0.12.1.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.12.1 release notes diff --git a/doc/release-notes/0.12/0.12.md b/doc/release-notes/0.12/0.12.md index 224817706f9..517290aa1f9 100644 --- a/doc/release-notes/0.12/0.12.md +++ b/doc/release-notes/0.12/0.12.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.12.0 release notes diff --git a/doc/release-notes/0.13/0.13.md b/doc/release-notes/0.13/0.13.md index 0c4d943b14e..c4f96bf046f 100644 --- a/doc/release-notes/0.13/0.13.md +++ b/doc/release-notes/0.13/0.13.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.13 release notes diff --git a/doc/release-notes/0.14/0.14.md b/doc/release-notes/0.14/0.14.md index a53350ea84c..8f526433a10 100644 --- a/doc/release-notes/0.14/0.14.md +++ b/doc/release-notes/0.14/0.14.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.14 release notes diff --git a/doc/release-notes/0.15/0.15.md b/doc/release-notes/0.15/0.15.md index 56e6e012901..fec438a1d2b 100644 --- a/doc/release-notes/0.15/0.15.md +++ b/doc/release-notes/0.15/0.15.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.15 release notes diff --git a/doc/release-notes/0.16/0.16.md b/doc/release-notes/0.16/0.16.md index 9e053e6198f..83b5d1c657d 100644 --- a/doc/release-notes/0.16/0.16.md +++ b/doc/release-notes/0.16/0.16.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.16 release notes diff --git a/doc/release-notes/0.17/0.17.md b/doc/release-notes/0.17/0.17.md index df48819f69e..b4c3b017d1c 100644 --- a/doc/release-notes/0.17/0.17.md +++ b/doc/release-notes/0.17/0.17.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.17 release notes diff --git a/doc/release-notes/0.18/0.18.md b/doc/release-notes/0.18/0.18.md index 4146880d7e6..6a3c652462a 100644 --- a/doc/release-notes/0.18/0.18.md +++ b/doc/release-notes/0.18/0.18.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.18.0 release notes diff --git a/doc/release-notes/0.19/0.19.md b/doc/release-notes/0.19/0.19.md index 2c65724c6c5..aa2ffab09d1 100644 --- a/doc/release-notes/0.19/0.19.md +++ b/doc/release-notes/0.19/0.19.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.19.0 release notes diff --git a/doc/release-notes/0.20/0.20.md b/doc/release-notes/0.20/0.20.md index df561c7457c..72193302899 100644 --- a/doc/release-notes/0.20/0.20.md +++ b/doc/release-notes/0.20/0.20.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.20.0 release notes diff --git a/doc/release-notes/0.21/0.21.md b/doc/release-notes/0.21/0.21.md index d9221a7c44a..45aede4422d 100644 --- a/doc/release-notes/0.21/0.21.md +++ b/doc/release-notes/0.21/0.21.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.21.0 release notes diff --git a/doc/release-notes/0.22/0.22.md b/doc/release-notes/0.22/0.22.md index 80897954404..172dc66a1d2 100644 --- a/doc/release-notes/0.22/0.22.md +++ b/doc/release-notes/0.22/0.22.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.22.0 release notes diff --git a/doc/release-notes/0.23/0.23.md b/doc/release-notes/0.23/0.23.md index 0a73e01a324..e8ff1923562 100644 --- a/doc/release-notes/0.23/0.23.md +++ b/doc/release-notes/0.23/0.23.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.23.0 release notes diff --git a/doc/release-notes/0.24/0.24.md b/doc/release-notes/0.24/0.24.md index d285d04a399..1eec2a56c11 100644 --- a/doc/release-notes/0.24/0.24.md +++ b/doc/release-notes/0.24/0.24.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.24.0 release notes diff --git a/doc/release-notes/0.25/0.25.md b/doc/release-notes/0.25/0.25.md index 97c00c53f14..9c0823c6f8c 100644 --- a/doc/release-notes/0.25/0.25.md +++ b/doc/release-notes/0.25/0.25.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.25.0 release notes diff --git a/doc/release-notes/0.26/0.26.md b/doc/release-notes/0.26/0.26.md index 5f0799cada8..859c2e5ca42 100644 --- a/doc/release-notes/0.26/0.26.md +++ b/doc/release-notes/0.26/0.26.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.26.0 release notes diff --git a/doc/release-notes/0.27/0.27.1.md b/doc/release-notes/0.27/0.27.1.md index 18420ae644e..45ae4808cc3 100644 --- a/doc/release-notes/0.27/0.27.1.md +++ b/doc/release-notes/0.27/0.27.1.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.27.1 release notes diff --git a/doc/release-notes/0.27/0.27.md b/doc/release-notes/0.27/0.27.md index 4b8db7be06f..b23c21102d0 100644 --- a/doc/release-notes/0.27/0.27.md +++ b/doc/release-notes/0.27/0.27.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.27.0 release notes diff --git a/doc/release-notes/0.29/0.29.1.md b/doc/release-notes/0.29/0.29.1.md index 36ca5f0c65e..76728aeb0c6 100644 --- a/doc/release-notes/0.29/0.29.1.md +++ b/doc/release-notes/0.29/0.29.1.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.29.1 release notes diff --git a/doc/release-notes/0.29/0.29.md b/doc/release-notes/0.29/0.29.md index f251a31359c..390809849e5 100644 --- a/doc/release-notes/0.29/0.29.md +++ b/doc/release-notes/0.29/0.29.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.29.0 release notes diff --git a/doc/release-notes/0.30/0.30.1.md b/doc/release-notes/0.30/0.30.1.md index 8a7c1f5b8d1..1ce701b35e7 100644 --- a/doc/release-notes/0.30/0.30.1.md +++ b/doc/release-notes/0.30/0.30.1.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.30.1 release notes diff --git a/doc/release-notes/0.30/0.30.md b/doc/release-notes/0.30/0.30.md index 7dc595a957e..34a406bbd3c 100644 --- a/doc/release-notes/0.30/0.30.md +++ b/doc/release-notes/0.30/0.30.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.30.0 release notes diff --git a/doc/release-notes/0.31/0.31.md b/doc/release-notes/0.31/0.31.md index 9c21e8c412a..732844bff39 100644 --- a/doc/release-notes/0.31/0.31.md +++ b/doc/release-notes/0.31/0.31.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.31.0 release notes diff --git a/doc/release-notes/0.32/0.32.md b/doc/release-notes/0.32/0.32.md index cdc30d78130..c4c2f89c6f7 100644 --- a/doc/release-notes/0.32/0.32.md +++ b/doc/release-notes/0.32/0.32.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.32.0 release notes diff --git a/doc/release-notes/0.33/0.33.md b/doc/release-notes/0.33/0.33.md index deacaac2200..0cf7a129164 100644 --- a/doc/release-notes/0.33/0.33.md +++ b/doc/release-notes/0.33/0.33.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.33.x release notes diff --git a/doc/release-notes/0.35/0.35.md b/doc/release-notes/0.35/0.35.md index 6dc33b7b0c3..3888809422d 100644 --- a/doc/release-notes/0.35/0.35.md +++ b/doc/release-notes/0.35/0.35.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.35.0 release notes diff --git a/doc/release-notes/0.36/0.36.md b/doc/release-notes/0.36/0.36.md index 63b7357df84..5ff39af6ad3 100644 --- a/doc/release-notes/0.36/0.36.md +++ b/doc/release-notes/0.36/0.36.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.36.x release notes diff --git a/doc/release-notes/0.37/0.37.md b/doc/release-notes/0.37/0.37.md index b9dfc793f83..9b30acb3a60 100644 --- a/doc/release-notes/0.37/0.37.md +++ b/doc/release-notes/0.37/0.37.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.37.0 release notes diff --git a/doc/release-notes/0.38/0.38.md b/doc/release-notes/0.38/0.38.md index 668b9d1ea49..64d65e92d67 100644 --- a/doc/release-notes/0.38/0.38.md +++ b/doc/release-notes/0.38/0.38.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.38.0 release notes diff --git a/doc/release-notes/0.8/0.8.md b/doc/release-notes/0.8/0.8.md index 1468f084da0..8a110ee86ef 100644 --- a/doc/release-notes/0.8/0.8.md +++ b/doc/release-notes/0.8/0.8.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.8 release notes diff --git a/doc/release-notes/0.9/0.9.md b/doc/release-notes/0.9/0.9.md index b453d503dfd..96a950a72dc 100644 --- a/doc/release-notes/0.9/0.9.md +++ b/doc/release-notes/0.9/0.9.md @@ -18,8 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH -* Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Eclipse OpenJ9 version 0.9.0 release notes diff --git a/jcl/.classpath b/jcl/.classpath index 230a4f064f5..6c750e79c05 100644 --- a/jcl/.classpath +++ b/jcl/.classpath @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/jcl/.gitignore b/jcl/.gitignore index 2e79b6b1120..f98e3d92737 100644 --- a/jcl/.gitignore +++ b/jcl/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *.class diff --git a/jcl/com.ibm.dtfj-javadoc-829.xml b/jcl/com.ibm.dtfj-javadoc-829.xml index 1cb0aa5ff7c..6b99d8f1f23 100644 --- a/jcl/com.ibm.dtfj-javadoc-829.xml +++ b/jcl/com.ibm.dtfj-javadoc-829.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/jcl/com.ibm.gpu-javadoc.xml b/jcl/com.ibm.gpu-javadoc.xml index 56eea5ded80..47fce679b49 100644 --- a/jcl/com.ibm.gpu-javadoc.xml +++ b/jcl/com.ibm.gpu-javadoc.xml @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/jcl/com.ibm.lang.management-javadoc-829.xml b/jcl/com.ibm.lang.management-javadoc-829.xml index 9952323d410..0acdf03d6f5 100644 --- a/jcl/com.ibm.lang.management-javadoc-829.xml +++ b/jcl/com.ibm.lang.management-javadoc-829.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/jcl/jdmpview (Eclipse IDE).launch b/jcl/jdmpview (Eclipse IDE).launch index 75a9f8fb65d..15e05e16083 100644 --- a/jcl/jdmpview (Eclipse IDE).launch +++ b/jcl/jdmpview (Eclipse IDE).launch @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/jcl/jpp_configuration.xml b/jcl/jpp_configuration.xml index 56812cbc32a..7806aada7b8 100644 --- a/jcl/jpp_configuration.xml +++ b/jcl/jpp_configuration.xml @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssist.java b/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssist.java index fe0f26b9de5..aba6e3a30c6 100644 --- a/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssist.java +++ b/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssist.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu.spi; diff --git a/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssistHolder.java b/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssistHolder.java index c254eb2da97..016919aae34 100644 --- a/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssistHolder.java +++ b/jcl/src/java.base/share/classes/com/ibm/gpu/spi/GPUAssistHolder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu.spi; diff --git a/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalConverters.java b/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalConverters.java index 03b2a642100..14710473b4e 100644 --- a/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalConverters.java +++ b/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalConverters.java @@ -23,7 +23,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class BigDecimalConverters extends BigDecimalExtension { diff --git a/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalExtension.java b/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalExtension.java index 811837f0068..6ea67914bf9 100644 --- a/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalExtension.java +++ b/jcl/src/java.base/share/classes/com/ibm/jit/BigDecimalExtension.java @@ -26,7 +26,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class BigDecimalExtension implements java.math.BigDecimal.BigDecimalExtension { diff --git a/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java b/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java index 7bf107dd132..c67a88b3dea 100644 --- a/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java +++ b/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import com.ibm.oti.vm.J9UnmodifiableClass; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/lang/ArgumentHelper.java b/jcl/src/java.base/share/classes/com/ibm/oti/lang/ArgumentHelper.java index 0e1413b606e..c111b9809b4 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/lang/ArgumentHelper.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/lang/ArgumentHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.lang; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/reflect/AnnotationParser.java b/jcl/src/java.base/share/classes/com/ibm/oti/reflect/AnnotationParser.java index 172377eb27c..2c3eb81a11a 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/reflect/AnnotationParser.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/reflect/AnnotationParser.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Annotation; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/reflect/Annotations.java b/jcl/src/java.base/share/classes/com/ibm/oti/reflect/Annotations.java index 5e8f4592886..2bf86135b6e 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/reflect/Annotations.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/reflect/Annotations.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Annotation; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/reflect/TypeAnnotationParser.java b/jcl/src/java.base/share/classes/com/ibm/oti/reflect/TypeAnnotationParser.java index d609d004898..bec1a743138 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/reflect/TypeAnnotationParser.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/reflect/TypeAnnotationParser.java @@ -29,7 +29,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * Retrieve RuntimeVisibleType Annotation attributes (JVM spec, section 4.7.20) from the ROM class and parse them into Java objects diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/ExternalMessages-MasterIndex.properties b/jcl/src/java.base/share/classes/com/ibm/oti/util/ExternalMessages-MasterIndex.properties index 5b2ddf596e5..7f2db22bd92 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/ExternalMessages-MasterIndex.properties +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/ExternalMessages-MasterIndex.properties @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # This file is the main index for external messages. The actual ExternalMessages.properties file # is generated by the preprocessor, and will contain only the messages used by the configuration diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/Msg.java b/jcl/src/java.base/share/classes/com/ibm/oti/util/Msg.java index 9ca8619976f..bc1979632ee 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/Msg.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/Msg.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.AccessController; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/PriviAction.java b/jcl/src/java.base/share/classes/com/ibm/oti/util/PriviAction.java index 1ab78f348cc..ca8f4596dfd 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/PriviAction.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/PriviAction.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.reflect.AccessibleObject; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/ReflectPermissions.java b/jcl/src/java.base/share/classes/com/ibm/oti/util/ReflectPermissions.java index 118424c4a26..29700381091 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/ReflectPermissions.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/ReflectPermissions.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.reflect.ReflectPermission; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/RuntimePermissions.java b/jcl/src/java.base/share/classes/com/ibm/oti/util/RuntimePermissions.java index 40db9d4e22b..b9f90be3814 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/RuntimePermissions.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/RuntimePermissions.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/Util.java b/jcl/src/java.base/share/classes/com/ibm/oti/util/Util.java index 16f7150f6aa..41823253bba 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/Util.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/Util.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/util/WeakReferenceNode.java b/jcl/src/java.base/share/classes/com/ibm/oti/util/WeakReferenceNode.java index a7239822958..e84bf8e9bd0 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/util/WeakReferenceNode.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/util/WeakReferenceNode.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/AbstractClassLoader.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/AbstractClassLoader.java index 151ecc1d010..9d336de3eac 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/AbstractClassLoader.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/AbstractClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.vm; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/BootstrapClassLoader.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/BootstrapClassLoader.java index 86acb9b003d..5e1ad425fe6 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/BootstrapClassLoader.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/BootstrapClassLoader.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.*; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/J9UnmodifiableClass.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/J9UnmodifiableClass.java index 82da457ba9f..df98aa86dca 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/J9UnmodifiableClass.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/J9UnmodifiableClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.vm; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/JarRunner.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/JarRunner.java index d9fcafcc8cb..6aeb679bda8 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/JarRunner.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/JarRunner.java @@ -25,7 +25,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class JarRunner { diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/MsgHelp.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/MsgHelp.java index 0158854a07e..e4bbc783052 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/MsgHelp.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/MsgHelp.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.vm; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java index a8a1b880e00..f83dbde56ae 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBBase.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.vm; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java index d090997a1ec..42848aab318 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/ORBVMHelpers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.vm; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/VM.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/VM.java index 1c07e097cd1..bc0e1f82a37 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/VM.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/VM.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import com.ibm.oti.util.Msg; diff --git a/jcl/src/java.base/share/classes/com/ibm/oti/vm/VMLangAccess.java b/jcl/src/java.base/share/classes/com/ibm/oti/vm/VMLangAccess.java index 522dff7ac6d..1c693ce2e5e 100644 --- a/jcl/src/java.base/share/classes/com/ibm/oti/vm/VMLangAccess.java +++ b/jcl/src/java.base/share/classes/com/ibm/oti/vm/VMLangAccess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.vm; diff --git a/jcl/src/java.base/share/classes/com/ibm/sharedclasses/spi/SharedClassProvider.java b/jcl/src/java.base/share/classes/com/ibm/sharedclasses/spi/SharedClassProvider.java index 714112ce688..69d31a4b578 100644 --- a/jcl/src/java.base/share/classes/com/ibm/sharedclasses/spi/SharedClassProvider.java +++ b/jcl/src/java.base/share/classes/com/ibm/sharedclasses/spi/SharedClassProvider.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.sharedclasses.spi; diff --git a/jcl/src/java.base/share/classes/java/lang/AbstractStringBuilder.java b/jcl/src/java.base/share/classes/java/lang/AbstractStringBuilder.java index ba9793f9cd7..817638142da 100644 --- a/jcl/src/java.base/share/classes/java/lang/AbstractStringBuilder.java +++ b/jcl/src/java.base/share/classes/java/lang/AbstractStringBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java index cd193a3cc77..c878a86c79a 100644 --- a/jcl/src/java.base/share/classes/java/lang/Access.java +++ b/jcl/src/java.base/share/classes/java/lang/Access.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 */ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/Class.java b/jcl/src/java.base/share/classes/java/lang/Class.java index 671ea9eb3a2..679cbc7468b 100644 --- a/jcl/src/java.base/share/classes/java/lang/Class.java +++ b/jcl/src/java.base/share/classes/java/lang/Class.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/ClassCastException.java b/jcl/src/java.base/share/classes/java/lang/ClassCastException.java index 842ead51507..b4dead386c4 100644 --- a/jcl/src/java.base/share/classes/java/lang/ClassCastException.java +++ b/jcl/src/java.base/share/classes/java/lang/ClassCastException.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/lang/ClassLoader.java b/jcl/src/java.base/share/classes/java/lang/ClassLoader.java index 59b38460c3c..7e3f7791305 100644 --- a/jcl/src/java.base/share/classes/java/lang/ClassLoader.java +++ b/jcl/src/java.base/share/classes/java/lang/ClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/Compiler.java b/jcl/src/java.base/share/classes/java/lang/Compiler.java index 14a85d3fde3..b50f14e00d4 100644 --- a/jcl/src/java.base/share/classes/java/lang/Compiler.java +++ b/jcl/src/java.base/share/classes/java/lang/Compiler.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/lang/InstantiationError.java b/jcl/src/java.base/share/classes/java/lang/InstantiationError.java index 2b518cd3195..798b04b5a6d 100644 --- a/jcl/src/java.base/share/classes/java/lang/InstantiationError.java +++ b/jcl/src/java.base/share/classes/java/lang/InstantiationError.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/lang/InstantiationException.java b/jcl/src/java.base/share/classes/java/lang/InstantiationException.java index 6aecdeefdea..77141d4d5cf 100644 --- a/jcl/src/java.base/share/classes/java/lang/InstantiationException.java +++ b/jcl/src/java.base/share/classes/java/lang/InstantiationException.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/lang/InternalAnonymousClassLoader.java b/jcl/src/java.base/share/classes/java/lang/InternalAnonymousClassLoader.java index 9ba629af818..512db63a391 100644 --- a/jcl/src/java.base/share/classes/java/lang/InternalAnonymousClassLoader.java +++ b/jcl/src/java.base/share/classes/java/lang/InternalAnonymousClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/InternalConstantPool.java b/jcl/src/java.base/share/classes/java/lang/InternalConstantPool.java index 097537d3356..a12a9ffb26a 100644 --- a/jcl/src/java.base/share/classes/java/lang/InternalConstantPool.java +++ b/jcl/src/java.base/share/classes/java/lang/InternalConstantPool.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java b/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java index a1f1fb2c641..ddc1e7ef8e9 100644 --- a/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java +++ b/jcl/src/java.base/share/classes/java/lang/J9VMInternals.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/LiveStackFrame.java b/jcl/src/java.base/share/classes/java/lang/LiveStackFrame.java index eda41f028d1..8a086d0066f 100644 --- a/jcl/src/java.base/share/classes/java/lang/LiveStackFrame.java +++ b/jcl/src/java.base/share/classes/java/lang/LiveStackFrame.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java b/jcl/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java index eda41f028d1..8a086d0066f 100644 --- a/jcl/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java +++ b/jcl/src/java.base/share/classes/java/lang/LiveStackFrameInfo.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/Object.java b/jcl/src/java.base/share/classes/java/lang/Object.java index be22ea6e9f0..3339ec4d6dd 100644 --- a/jcl/src/java.base/share/classes/java/lang/Object.java +++ b/jcl/src/java.base/share/classes/java/lang/Object.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/RuntimePermission.java b/jcl/src/java.base/share/classes/java/lang/RuntimePermission.java index 1236d035576..6f1e4411061 100644 --- a/jcl/src/java.base/share/classes/java/lang/RuntimePermission.java +++ b/jcl/src/java.base/share/classes/java/lang/RuntimePermission.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/lang/StackFrameInfo.java b/jcl/src/java.base/share/classes/java/lang/StackFrameInfo.java index eda41f028d1..8a086d0066f 100644 --- a/jcl/src/java.base/share/classes/java/lang/StackFrameInfo.java +++ b/jcl/src/java.base/share/classes/java/lang/StackFrameInfo.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/StackStreamFactory.java b/jcl/src/java.base/share/classes/java/lang/StackStreamFactory.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.base/share/classes/java/lang/StackStreamFactory.java +++ b/jcl/src/java.base/share/classes/java/lang/StackStreamFactory.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/StackTraceElement.java b/jcl/src/java.base/share/classes/java/lang/StackTraceElement.java index 4b55135dcc5..b4cf689bd60 100644 --- a/jcl/src/java.base/share/classes/java/lang/StackTraceElement.java +++ b/jcl/src/java.base/share/classes/java/lang/StackTraceElement.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/StackWalker.java b/jcl/src/java.base/share/classes/java/lang/StackWalker.java index da0e3901826..215dbec7293 100644 --- a/jcl/src/java.base/share/classes/java/lang/StackWalker.java +++ b/jcl/src/java.base/share/classes/java/lang/StackWalker.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/String.java b/jcl/src/java.base/share/classes/java/lang/String.java index 7df1fbede51..103b0772d10 100644 --- a/jcl/src/java.base/share/classes/java/lang/String.java +++ b/jcl/src/java.base/share/classes/java/lang/String.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/StringBuffer.java b/jcl/src/java.base/share/classes/java/lang/StringBuffer.java index 03cb4c58bee..147c05a711d 100644 --- a/jcl/src/java.base/share/classes/java/lang/StringBuffer.java +++ b/jcl/src/java.base/share/classes/java/lang/StringBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/StringBuilder.java b/jcl/src/java.base/share/classes/java/lang/StringBuilder.java index d0844224d24..74bb49bcd3c 100644 --- a/jcl/src/java.base/share/classes/java/lang/StringBuilder.java +++ b/jcl/src/java.base/share/classes/java/lang/StringBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/System.java b/jcl/src/java.base/share/classes/java/lang/System.java index 46f353cd27e..a955997700f 100644 --- a/jcl/src/java.base/share/classes/java/lang/System.java +++ b/jcl/src/java.base/share/classes/java/lang/System.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/Thread.java b/jcl/src/java.base/share/classes/java/lang/Thread.java index 0c88bea3e62..54a1f5f461a 100644 --- a/jcl/src/java.base/share/classes/java/lang/Thread.java +++ b/jcl/src/java.base/share/classes/java/lang/Thread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/ThreadGroup.java b/jcl/src/java.base/share/classes/java/lang/ThreadGroup.java index afe3ed34fa6..a85713a0f8e 100644 --- a/jcl/src/java.base/share/classes/java/lang/ThreadGroup.java +++ b/jcl/src/java.base/share/classes/java/lang/ThreadGroup.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/Throwable.java b/jcl/src/java.base/share/classes/java/lang/Throwable.java index b6a99d6eac7..66a608ba137 100644 --- a/jcl/src/java.base/share/classes/java/lang/Throwable.java +++ b/jcl/src/java.base/share/classes/java/lang/Throwable.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/VMAccess.java b/jcl/src/java.base/share/classes/java/lang/VMAccess.java index d84c66cdbdc..32fcdee5643 100644 --- a/jcl/src/java.base/share/classes/java/lang/VMAccess.java +++ b/jcl/src/java.base/share/classes/java/lang/VMAccess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/jcl/src/java.base/share/classes/java/lang/about.html b/jcl/src/java.base/share/classes/java/lang/about.html index bff2470e840..b2e422888ef 100644 --- a/jcl/src/java.base/share/classes/java/lang/about.html +++ b/jcl/src/java.base/share/classes/java/lang/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ArgumentConversionHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ArgumentConversionHandle.java index b0a70385b6b..0d46e8928f7 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ArgumentConversionHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ArgumentConversionHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ArrayVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ArrayVarHandle.java index c8dbfca4ce0..75d54634a37 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ArrayVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ArrayVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/AsTypeHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/AsTypeHandle.java index 162d99b9ed8..fbed149099f 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/AsTypeHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/AsTypeHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java b/jcl/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java index 10ca274cdfc..a4905e367e1 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/BootstrapMethodInvoker.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java index 811064a0fc4..66fea65a2aa 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/BruteArgumentMoverHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/BruteArgumentMoverHandle.java index a858813c1a3..49b3218eab1 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/BruteArgumentMoverHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/BruteArgumentMoverHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ByteArrayViewVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ByteArrayViewVarHandle.java index 65f10ee3c66..63e9ca6ee56 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ByteArrayViewVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ByteArrayViewVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ByteBufferViewVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ByteBufferViewVarHandle.java index 9febdb67a60..ee26cd45dc9 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ByteBufferViewVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ByteBufferViewVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/CacheKey.java b/jcl/src/java.base/share/classes/java/lang/invoke/CacheKey.java index d5d8e740783..2690df4671f 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/CacheKey.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/CacheKey.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/CallSite.java b/jcl/src/java.base/share/classes/java/lang/invoke/CallSite.java index 78dc78ba50f..495b72effa6 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/CallSite.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/CallSite.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/CatchHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/CatchHandle.java index da74f6f3a0f..1530192632e 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/CatchHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/CatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/CollectHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/CollectHandle.java index 3fd30e88328..b3b75cbc8b9 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/CollectHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/CollectHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java b/jcl/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java index 9c7719bd3f1..63975c4bdfa 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ConstantCallSite.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ConstantHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ConstantHandle.java index 0b9108a07b8..75a16e4b821 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ConstantHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ConstantHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ConstructorHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ConstructorHandle.java index 9acc9808c7d..840be23cbdc 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ConstructorHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ConstructorHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ConvertHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ConvertHandle.java index b878c8d9d63..c8cbc7e2084 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ConvertHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ConvertHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/DefaultMethodConflictException.java b/jcl/src/java.base/share/classes/java/lang/invoke/DefaultMethodConflictException.java index 33459e2e206..8ac93173a85 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/DefaultMethodConflictException.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/DefaultMethodConflictException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java index 8ae938386ad..e89dbf036ff 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/DelegatingMethodHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/DirectHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/DirectHandle.java index 3ce6a7112a0..7504181005d 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/DirectHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/DirectHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java index 7e7d9318d65..930e200002a 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[IF JAVA_SPEC_VERSION >= 15]*/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/DynamicInvokerHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/DynamicInvokerHandle.java index ae352ab08a0..80d9b1e837a 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/DynamicInvokerHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/DynamicInvokerHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ExplicitCastHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ExplicitCastHandle.java index 16949addf33..455d37d8764 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ExplicitCastHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ExplicitCastHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FieldGetterHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FieldGetterHandle.java index 02edccc52df..dfa63202cf8 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FieldGetterHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FieldGetterHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FieldHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FieldHandle.java index f66aa4e4f89..489534508a4 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FieldHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FieldHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FieldSetterHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FieldSetterHandle.java index 190aa984086..6231a6f89c8 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FieldSetterHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FieldSetterHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FieldVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FieldVarHandle.java index 2a964106b68..63996bfd27a 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FieldVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FieldVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FilterArgumentsHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FilterArgumentsHandle.java index a39506b5f47..c308f64eada 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FilterArgumentsHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FilterArgumentsHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FilterReturnHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FilterReturnHandle.java index c8ecb3e1559..8503252b5f9 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FilterReturnHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FilterReturnHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FinallyHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FinallyHandle.java index ba7ed667cbf..1ec2d3b9574 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FinallyHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FinallyHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/FoldHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/FoldHandle.java index 0481ce084a6..942bce4c531 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/FoldHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/FoldHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java b/jcl/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java index e35381aea82..9325dedfb1b 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/GuardWithTestHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/GuardWithTestHandle.java index 29b9cdae530..6df562d3669 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/GuardWithTestHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/GuardWithTestHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/HandleCache.java b/jcl/src/java.base/share/classes/java/lang/invoke/HandleCache.java index 829cecb3b78..e145f000a28 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/HandleCache.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/HandleCache.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/IndirectHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/IndirectHandle.java index 2de0f14d6a5..62a95d91fbb 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/IndirectHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/IndirectHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java b/jcl/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java index f0478f77963..6e2e14f4cae 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InfoFromMemberName.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[IF JAVA_SPEC_VERSION >= 15]*/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/Insert1Handle.java b/jcl/src/java.base/share/classes/java/lang/invoke/Insert1Handle.java index 2ba4750f1e2..6ca1779a07e 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/Insert1Handle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/Insert1Handle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/Insert1IntHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/Insert1IntHandle.java index e08906938aa..50bd687f2bf 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/Insert1IntHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/Insert1IntHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/Insert2Handle.java b/jcl/src/java.base/share/classes/java/lang/invoke/Insert2Handle.java index 02f6757f788..853f91498ab 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/Insert2Handle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/Insert2Handle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/Insert3Handle.java b/jcl/src/java.base/share/classes/java/lang/invoke/Insert3Handle.java index d693ea452d7..ed585163a93 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/Insert3Handle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/Insert3Handle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InsertHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/InsertHandle.java index c22caa890b0..ddf95bf6773 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InsertHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InsertHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InstanceFieldVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/InstanceFieldVarHandle.java index 440edb38dad..30542c7c90d 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InstanceFieldVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InstanceFieldVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InterfaceHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/InterfaceHandle.java index 9030463dd55..20e8517f00d 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InterfaceHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InterfaceHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InvokeExactHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/InvokeExactHandle.java index 1f7703b3c33..cd4f622153c 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InvokeExactHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InvokeExactHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InvokeGenericHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/InvokeGenericHandle.java index 66698db60af..6c7307fe9ef 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InvokeGenericHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InvokeGenericHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jcl/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index e9eed65647a..ce000448e52 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java b/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java index 6db01517ab9..aeda5cf602e 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/Invokers.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/jcl/src/java.base/share/classes/java/lang/invoke/LambdaForm.java index b37997fb049..fdaf54bfd10 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/LambdaForm.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/LambdaForm.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java b/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java index 6db01517ab9..aeda5cf602e 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormBuffer.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java b/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java index 0eba7702e90..70036792355 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/LoopHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/LoopHandle.java index 2ea45684791..ccb4b42ccb3 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/LoopHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/LoopHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MemberName.java b/jcl/src/java.base/share/classes/java/lang/invoke/MemberName.java index 3ae3acef77c..0cdd96b0959 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MemberName.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MemberName.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandle.java index 58f1ee04752..ecd81207254 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleCache.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleCache.java index ade48aa2d3d..06e0be8e3eb 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleCache.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleCache.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java index 682396f9b30..9ba38878554 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfoImpl.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfoImpl.java index 623a1fcb3c9..02b439ea8f1 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfoImpl.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleInfoImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java index 959142afd55..04369920045 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[IF JAVA_SPEC_VERSION >= 11]*/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleResolver.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleResolver.java index 7b930b4939b..3c4e3f358d8 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleResolver.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandleResolver.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index dae012daa09..64051af0e72 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodType.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodType.java index c2beb56807f..7799198aea7 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodType.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodType.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java index 399e021455e..7178e7e1465 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeHelper.java b/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeHelper.java index 6d4449ea185..fe1b48cf752 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeHelper.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MethodTypeHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java b/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java index 930419a53c7..b5e64f17465 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSite.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSiteDynamicInvokerHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSiteDynamicInvokerHandle.java index 68e98edc93c..d13d112f6ee 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSiteDynamicInvokerHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/MutableCallSiteDynamicInvokerHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java index f9b5d1e03fa..9e52719817f 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/NativeMethodHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/OpenJDKCompileStub.java b/jcl/src/java.base/share/classes/java/lang/invoke/OpenJDKCompileStub.java index dafe6c5ee59..e66e034ce78 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/OpenJDKCompileStub.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/OpenJDKCompileStub.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/PassThroughHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/PassThroughHandle.java index e9e9e5569f8..c7e6e988145 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/PassThroughHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/PassThroughHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/PermuteHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/PermuteHandle.java index a83f35c7f57..1d079af6883 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/PermuteHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/PermuteHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/PrimitiveHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/PrimitiveHandle.java index aa7701fbe82..1558588eb49 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/PrimitiveHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/PrimitiveHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ReceiverBoundHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ReceiverBoundHandle.java index 98ce5bfc2f7..56b201cec7b 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ReceiverBoundHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ReceiverBoundHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrame.java b/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrame.java index dad24b19c35..f7edb1fbd73 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrame.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrameInjector.java b/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrameInjector.java index bac304947ad..98d6068c33a 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrameInjector.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/SecurityFrameInjector.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java index 9dda8dccb50..4dd88c0e01f 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/SimpleMethodHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/SpreadHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/SpreadHandle.java index 779025772d4..67cbae20ec4 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/SpreadHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/SpreadHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldGetterHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldGetterHandle.java index d14d49ff4f1..8836559e04a 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldGetterHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldGetterHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldSetterHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldSetterHandle.java index 457ae72ba9b..6b7fb43d1b7 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldSetterHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldSetterHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldVarHandle.java index d004fb35025..4672a80e9c1 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/StaticFieldVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_CLASS.java b/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_CLASS.java index a6d0ed432bf..aa610bfd49e 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_CLASS.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_CLASS.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_FIELD.java b/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_FIELD.java index bcdbfa100e8..e850c2ae2d3 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_FIELD.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_FIELD.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_METHOD.java b/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_METHOD.java index a956de38d23..7c716a4d9a3 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_METHOD.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VMCONSTANTPOOL_METHOD.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java index 8e1530a1bee..3d7103bf99b 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java index 612d6085bbd..1cda1e825d6 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleByteArrayBase.java @@ -18,5 +18,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java index 3a6c9d1667b..868ef1e341f 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleGuards.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInternal.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInternal.java index 53050f29652..b79e472530b 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInternal.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInternal.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeExactHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeExactHandle.java index a2b7638a5c8..91fa09969a9 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeExactHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeExactHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeGenericHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeGenericHandle.java index 34347129220..33b9885be8f 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeGenericHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeGenericHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeHandle.java index 250b4a14a5e..6a9fab6a989 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandleInvokeHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandles.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandles.java index 0e9e283bb00..995102cd04d 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarHandles.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarHandles.java @@ -18,5 +18,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VarargsCollectorHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VarargsCollectorHandle.java index f7b14f1243b..ae06bbceb61 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VarargsCollectorHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VarargsCollectorHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/ViewVarHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/ViewVarHandle.java index 0f1e9d9dba8..db3cf7eb7e6 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/ViewVarHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/ViewVarHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VirtualHandle.java b/jcl/src/java.base/share/classes/java/lang/invoke/VirtualHandle.java index 15d0930c091..9df9992a5dd 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VirtualHandle.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VirtualHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java b/jcl/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java index 5451ba5c310..d50a1921e82 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/VolatileCallSite.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java b/jcl/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java index c9bd7841639..9b37e800a1b 100644 --- a/jcl/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java +++ b/jcl/src/java.base/share/classes/java/lang/invoke/WrongMethodTypeException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.invoke; diff --git a/jcl/src/java.base/share/classes/java/lang/ref/FinalReference.java b/jcl/src/java.base/share/classes/java/lang/ref/FinalReference.java index d741b4fd983..fd8463e6dbc 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/FinalReference.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/FinalReference.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ final class FinalReference extends Reference { diff --git a/jcl/src/java.base/share/classes/java/lang/ref/Finalizer.java b/jcl/src/java.base/share/classes/java/lang/ref/Finalizer.java index ffa7d27a074..a02f6a5d8ba 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/Finalizer.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/Finalizer.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ final class Finalizer { diff --git a/jcl/src/java.base/share/classes/java/lang/ref/PhantomReference.java b/jcl/src/java.base/share/classes/java/lang/ref/PhantomReference.java index 9c80cd59e19..dd88bf5dbcd 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/PhantomReference.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/PhantomReference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.ref; diff --git a/jcl/src/java.base/share/classes/java/lang/ref/Reference.java b/jcl/src/java.base/share/classes/java/lang/ref/Reference.java index b3e615e8613..0d7cecedc5a 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/Reference.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/Reference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.ref; diff --git a/jcl/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/jcl/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java index 4de68a11551..2038ce23292 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.ref; diff --git a/jcl/src/java.base/share/classes/java/lang/ref/SoftReference.java b/jcl/src/java.base/share/classes/java/lang/ref/SoftReference.java index 4eddf46f557..5270887bff1 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/SoftReference.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/SoftReference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.ref; diff --git a/jcl/src/java.base/share/classes/java/lang/ref/WeakReference.java b/jcl/src/java.base/share/classes/java/lang/ref/WeakReference.java index 335a00425a1..46defa48484 100644 --- a/jcl/src/java.base/share/classes/java/lang/ref/WeakReference.java +++ b/jcl/src/java.base/share/classes/java/lang/ref/WeakReference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.ref; diff --git a/jcl/src/java.base/share/classes/java/lang/reflect/Array.java b/jcl/src/java.base/share/classes/java/lang/reflect/Array.java index f7450a1e5ed..336410c3503 100644 --- a/jcl/src/java.base/share/classes/java/lang/reflect/Array.java +++ b/jcl/src/java.base/share/classes/java/lang/reflect/Array.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/java/security/AccessControlContext.java b/jcl/src/java.base/share/classes/java/security/AccessControlContext.java index 2720521da30..a786ae2e867 100644 --- a/jcl/src/java.base/share/classes/java/security/AccessControlContext.java +++ b/jcl/src/java.base/share/classes/java/security/AccessControlContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.security; diff --git a/jcl/src/java.base/share/classes/java/security/AccessController.java b/jcl/src/java.base/share/classes/java/security/AccessController.java index ab96f1cba97..b8f6dc58359 100644 --- a/jcl/src/java.base/share/classes/java/security/AccessController.java +++ b/jcl/src/java.base/share/classes/java/security/AccessController.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.security; diff --git a/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java b/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java index b3d11442a8a..53e719e1470 100644 --- a/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java +++ b/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.foreign.abi; diff --git a/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java b/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java index 689020c2acd..8b5b446dee9 100644 --- a/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java +++ b/jcl/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.foreign.abi; diff --git a/jcl/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/jcl/src/java.base/share/classes/jdk/internal/misc/Unsafe.java index c2537c67d71..4506f1b702f 100644 --- a/jcl/src/java.base/share/classes/jdk/internal/misc/Unsafe.java +++ b/jcl/src/java.base/share/classes/jdk/internal/misc/Unsafe.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.misc; diff --git a/jcl/src/java.base/share/classes/jdk/internal/ref/CleanerShutdown.java b/jcl/src/java.base/share/classes/jdk/internal/ref/CleanerShutdown.java index 9f92778da2f..7901715374d 100644 --- a/jcl/src/java.base/share/classes/jdk/internal/ref/CleanerShutdown.java +++ b/jcl/src/java.base/share/classes/jdk/internal/ref/CleanerShutdown.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.ref; diff --git a/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java b/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java index fb37e40117e..b594f4368bc 100644 --- a/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java +++ b/jcl/src/java.base/share/classes/jdk/internal/vm/Continuation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.vm; diff --git a/jcl/src/java.base/share/classes/module-info.java.extra b/jcl/src/java.base/share/classes/module-info.java.extra index e05030751db..a627f0c4422 100644 --- a/jcl/src/java.base/share/classes/module-info.java.extra +++ b/jcl/src/java.base/share/classes/module-info.java.extra @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ exports com.ibm.sharedclasses.spi to diff --git a/jcl/src/java.base/share/classes/openj9/internal/criu/InternalCRIUSupport.java b/jcl/src/java.base/share/classes/openj9/internal/criu/InternalCRIUSupport.java index c8761ee4cbd..bdeeb590406 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/criu/InternalCRIUSupport.java +++ b/jcl/src/java.base/share/classes/openj9/internal/criu/InternalCRIUSupport.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.criu; diff --git a/jcl/src/java.base/share/classes/openj9/internal/criu/NotCheckpointSafe.java b/jcl/src/java.base/share/classes/openj9/internal/criu/NotCheckpointSafe.java index 086caef6ce8..1b54d670662 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/criu/NotCheckpointSafe.java +++ b/jcl/src/java.base/share/classes/openj9/internal/criu/NotCheckpointSafe.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.criu; diff --git a/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java b/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java index e46924eff04..58de077ffbe 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java +++ b/jcl/src/java.base/share/classes/openj9/internal/criu/security/CRIUConfigurator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.criu.security; diff --git a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java index 722592dd13e..049b9257e54 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java +++ b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.foreign.abi; diff --git a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java index 11186040314..d22423857ec 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java +++ b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.foreign.abi; diff --git a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java index 7da5253399e..4b9def6564a 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java +++ b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.foreign.abi; diff --git a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java index 0a25cc71a2c..126a1ed4150 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java +++ b/jcl/src/java.base/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.foreign.abi; diff --git a/jcl/src/java.base/share/classes/openj9/internal/management/ClassLoaderInfoBaseImpl.java b/jcl/src/java.base/share/classes/openj9/internal/management/ClassLoaderInfoBaseImpl.java index 7c5da869b6b..5027d6e3ee4 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/management/ClassLoaderInfoBaseImpl.java +++ b/jcl/src/java.base/share/classes/openj9/internal/management/ClassLoaderInfoBaseImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.management; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java index 15566ea778a..7f854bc2d10 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Advertisement.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java index 6f0b7cd2581..90717b9850c 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachHandler.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java index a23ad31f8d2..8d03f565446 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Attachment.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java index 2de99cab0d3..e2b6d948af7 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/AttachmentConnection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java index d5a27ca3a43..93c7c219a5f 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Command.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java index e728a3007d7..b42ff7ef9ef 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/CommonDirectory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticProperties.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticProperties.java index 33684681748..b0ffe3d3994 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticProperties.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticProperties.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticUtils.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticUtils.java index d3de8851340..fded086fda3 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticUtils.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/DiagnosticUtils.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java index c4eeee8d37c..2a310131618 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FileLock.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java index bc410eca006..a98890c5a24 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/FilelockTimer.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.reflect.Field; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java index 175772ee8d0..e008afea945 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IPC.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java index 16785f21c53..87681000a5e 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/IbmAttachOperationFailedException.java @@ -26,7 +26,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java index 9630a604e45..5a8fccd071e 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Reply.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java index 076e804ff96..c5b8ae0ed88 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/Response.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java index 502910441a0..5699cfa5a4e 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/TargetDirectory.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java index 206bbbe730c..dd91137a000 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/WaitLoop.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.tools.attach.target; diff --git a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java index 007b2f7b933..aceb988f549 100644 --- a/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java +++ b/jcl/src/java.base/share/classes/openj9/internal/tools/attach/target/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/java.base/share/classes/openj9/management/internal/DumpConfigurationUnavailableExceptionBase.java b/jcl/src/java.base/share/classes/openj9/management/internal/DumpConfigurationUnavailableExceptionBase.java index 2ff9ce73951..f598eeecbb9 100644 --- a/jcl/src/java.base/share/classes/openj9/management/internal/DumpConfigurationUnavailableExceptionBase.java +++ b/jcl/src/java.base/share/classes/openj9/management/internal/DumpConfigurationUnavailableExceptionBase.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.management.internal; diff --git a/jcl/src/java.base/share/classes/openj9/management/internal/InvalidDumpOptionExceptionBase.java b/jcl/src/java.base/share/classes/openj9/management/internal/InvalidDumpOptionExceptionBase.java index 7ced58fb3c4..53e6d16d434 100644 --- a/jcl/src/java.base/share/classes/openj9/management/internal/InvalidDumpOptionExceptionBase.java +++ b/jcl/src/java.base/share/classes/openj9/management/internal/InvalidDumpOptionExceptionBase.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.management.internal; diff --git a/jcl/src/java.base/share/classes/openj9/management/internal/LockInfoBase.java b/jcl/src/java.base/share/classes/openj9/management/internal/LockInfoBase.java index 51dcd882cd7..3870b3d7b26 100644 --- a/jcl/src/java.base/share/classes/openj9/management/internal/LockInfoBase.java +++ b/jcl/src/java.base/share/classes/openj9/management/internal/LockInfoBase.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.management.internal; diff --git a/jcl/src/java.base/share/classes/openj9/management/internal/MonitorInfoBase.java b/jcl/src/java.base/share/classes/openj9/management/internal/MonitorInfoBase.java index 89f8c6d52e1..28b1d4b898a 100644 --- a/jcl/src/java.base/share/classes/openj9/management/internal/MonitorInfoBase.java +++ b/jcl/src/java.base/share/classes/openj9/management/internal/MonitorInfoBase.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.management.internal; diff --git a/jcl/src/java.base/share/classes/openj9/management/internal/ThreadInfoBase.java b/jcl/src/java.base/share/classes/openj9/management/internal/ThreadInfoBase.java index a751f276cb6..930a3a5b953 100644 --- a/jcl/src/java.base/share/classes/openj9/management/internal/ThreadInfoBase.java +++ b/jcl/src/java.base/share/classes/openj9/management/internal/ThreadInfoBase.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.management.internal; diff --git a/jcl/src/java.desktop/share/classes/java/beans/ConstructorProperties.java b/jcl/src/java.desktop/share/classes/java/beans/ConstructorProperties.java index 1f5f081470d..cd77bd7e372 100644 --- a/jcl/src/java.desktop/share/classes/java/beans/ConstructorProperties.java +++ b/jcl/src/java.desktop/share/classes/java/beans/ConstructorProperties.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.beans; diff --git a/jcl/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java b/jcl/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java index fb7d4e2b1ba..104a1d33d2a 100644 --- a/jcl/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java +++ b/jcl/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.util.logging; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/BufferPoolMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/BufferPoolMXBeanImpl.java index a12872416bf..22822113d6e 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/BufferPoolMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/BufferPoolMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ClassLoadingMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ClassLoadingMXBeanImpl.java index e1b1b9ee2ee..024ccc282b2 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ClassLoadingMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ClassLoadingMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/CompilationMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/CompilationMXBeanImpl.java index d8d30f158b4..480e8fca6a0 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/CompilationMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/CompilationMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ComponentBuilder.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ComponentBuilder.java index 9623a7357ff..b299f1893fa 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ComponentBuilder.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ComponentBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/GarbageCollectorMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/GarbageCollectorMXBeanImpl.java index 718bf81ca2d..ec0232cd7be 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/GarbageCollectorMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/GarbageCollectorMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LazyDelegatingNotifier.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LazyDelegatingNotifier.java index 1cfe65a0a79..3f28a2cac12 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LazyDelegatingNotifier.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LazyDelegatingNotifier.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LockInfoUtil.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LockInfoUtil.java index b5e63fa87c8..49619107d88 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LockInfoUtil.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LockInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LoggingMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LoggingMXBeanImpl.java index 652e0047ff1..6ea7409c396 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LoggingMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/LoggingMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementAccessControl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementAccessControl.java index 2f1ebfd3cc2..9fc8fac2f1b 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementAccessControl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementAccessControl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementPermissionHelper.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementPermissionHelper.java index 2ca5fc38983..0378f4c5bf5 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementPermissionHelper.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementPermissionHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java index 766d4529743..7bb92f07069 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ManagementUtils.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryMXBeanImpl.java index 379f38bf607..b43d2c0be85 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryManagerMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryManagerMXBeanImpl.java index dff87067b88..392d2f2e5b5 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryManagerMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryManagerMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryNotificationInfoUtil.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryNotificationInfoUtil.java index 50f57a453d5..474769f4c19 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryNotificationInfoUtil.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryNotificationInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryPoolMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryPoolMXBeanImpl.java index a599eb91254..01d94620765 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryPoolMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryPoolMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryUsageUtil.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryUsageUtil.java index b4add2a6eb7..85318b0a95c 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryUsageUtil.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MemoryUsageUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MonitorInfoUtil.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MonitorInfoUtil.java index 73465d29bdd..fb418b8bc6e 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MonitorInfoUtil.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/MonitorInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/OperatingSystemMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/OperatingSystemMXBeanImpl.java index 8a7d2ed3715..f5746d94b37 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/OperatingSystemMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/OperatingSystemMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/RuntimeMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/RuntimeMXBeanImpl.java index 491a80e6f09..565fc9d46a7 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/RuntimeMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/RuntimeMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/StackTraceElementUtil.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/StackTraceElementUtil.java index 8a4375bc8c1..3ada5310591 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/StackTraceElementUtil.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/StackTraceElementUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoAccess.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoAccess.java index b45019bb75e..0147934e257 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoAccess.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoAccess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoUtil.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoUtil.java index 8aae0ee6c49..d1eb6a1a042 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoUtil.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadMXBeanImpl.java b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadMXBeanImpl.java index 4d60d74c372..505dd7df46f 100644 --- a/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadMXBeanImpl.java +++ b/jcl/src/java.management/share/classes/com/ibm/java/lang/management/internal/ThreadMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.lang.management.internal; diff --git a/jcl/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java index fc7cb375db4..f7bd5c59300 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/BufferPoolMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java index 1cfc74dc41e..0fabbe0ff0a 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/ClassLoadingMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/CompilationMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/CompilationMXBean.java index e096c5cfb49..954dc124046 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/CompilationMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/CompilationMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java b/jcl/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java index 4e409ae2033..8870cf3cff0 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java +++ b/jcl/src/java.management/share/classes/java/lang/management/DefaultPlatformMBeanProvider.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java index 04d3eec410e..09837bede9b 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/GarbageCollectorMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/LockInfo.java b/jcl/src/java.management/share/classes/java/lang/management/LockInfo.java index dc1645641cb..c2a7aadd813 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/LockInfo.java +++ b/jcl/src/java.management/share/classes/java/lang/management/LockInfo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/jcl/src/java.management/share/classes/java/lang/management/ManagementFactory.java index 5a33a756dcd..04946b69172 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/ManagementFactory.java +++ b/jcl/src/java.management/share/classes/java/lang/management/ManagementFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/ManagementPermission.java b/jcl/src/java.management/share/classes/java/lang/management/ManagementPermission.java index 4db422dc9d3..c35388d2f2e 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/ManagementPermission.java +++ b/jcl/src/java.management/share/classes/java/lang/management/ManagementPermission.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MemoryMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/MemoryMXBean.java index e1cd71d052c..df1e312c1a2 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MemoryMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MemoryMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java index 72ae8fc3cca..4fa24b50f27 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MemoryManagerMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java b/jcl/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java index 3ab8a9d9c7d..179d1618e41 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MemoryNotificationInfo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java index ae779a168bb..6757ec1451b 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MemoryPoolMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MemoryType.java b/jcl/src/java.management/share/classes/java/lang/management/MemoryType.java index 6b81ed3840d..9533a278449 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MemoryType.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MemoryType.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MemoryUsage.java b/jcl/src/java.management/share/classes/java/lang/management/MemoryUsage.java index ba61f0fc604..1845b04c12f 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MemoryUsage.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MemoryUsage.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/MonitorInfo.java b/jcl/src/java.management/share/classes/java/lang/management/MonitorInfo.java index a3e6b105fca..d110aaf5aa5 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/MonitorInfo.java +++ b/jcl/src/java.management/share/classes/java/lang/management/MonitorInfo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java index 8ad508988d5..f6f196cd778 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/OperatingSystemMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java index 6dd0588298e..47e2e795304 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java b/jcl/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java index d3100c12056..e1de368f932 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java +++ b/jcl/src/java.management/share/classes/java/lang/management/PlatformManagedObject.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java index 3b45c44b476..77fb2ff7113 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/RuntimeMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/ThreadInfo.java b/jcl/src/java.management/share/classes/java/lang/management/ThreadInfo.java index 879d8850714..3067dc6fed8 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/ThreadInfo.java +++ b/jcl/src/java.management/share/classes/java/lang/management/ThreadInfo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/ThreadInfoAccessImpl.java b/jcl/src/java.management/share/classes/java/lang/management/ThreadInfoAccessImpl.java index af10ceb64ac..13e2334a48d 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/ThreadInfoAccessImpl.java +++ b/jcl/src/java.management/share/classes/java/lang/management/ThreadInfoAccessImpl.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/java/lang/management/ThreadMXBean.java b/jcl/src/java.management/share/classes/java/lang/management/ThreadMXBean.java index dcdc62fbec3..b89a95c5dc4 100644 --- a/jcl/src/java.management/share/classes/java/lang/management/ThreadMXBean.java +++ b/jcl/src/java.management/share/classes/java/lang/management/ThreadMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang.management; diff --git a/jcl/src/java.management/share/classes/module-info.java.extra b/jcl/src/java.management/share/classes/module-info.java.extra index 5eeb2223e65..33eeee7611f 100644 --- a/jcl/src/java.management/share/classes/module-info.java.extra +++ b/jcl/src/java.management/share/classes/module-info.java.extra @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ exports com.ibm.java.lang.management.internal to jdk.jcmd, jdk.management; diff --git a/jcl/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java b/jcl/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/ClassLoadingImpl.java b/jcl/src/java.management/share/classes/sun/management/ClassLoadingImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/ClassLoadingImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/ClassLoadingImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/CompilationImpl.java b/jcl/src/java.management/share/classes/sun/management/CompilationImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/CompilationImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/CompilationImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/CompilerThreadStat.java b/jcl/src/java.management/share/classes/sun/management/CompilerThreadStat.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/CompilerThreadStat.java +++ b/jcl/src/java.management/share/classes/sun/management/CompilerThreadStat.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java b/jcl/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/GarbageCollectorImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotClassLoading.java b/jcl/src/java.management/share/classes/sun/management/HotspotClassLoading.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotClassLoading.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotClassLoading.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java b/jcl/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotClassLoadingMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotCompilation.java b/jcl/src/java.management/share/classes/sun/management/HotspotCompilation.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotCompilation.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotCompilation.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java b/jcl/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotInternal.java b/jcl/src/java.management/share/classes/sun/management/HotspotInternal.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotInternal.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotInternal.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotInternalMBean.java b/jcl/src/java.management/share/classes/sun/management/HotspotInternalMBean.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotInternalMBean.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotInternalMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotMemory.java b/jcl/src/java.management/share/classes/sun/management/HotspotMemory.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotMemory.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotMemory.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java b/jcl/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotMemoryMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotRuntime.java b/jcl/src/java.management/share/classes/sun/management/HotspotRuntime.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotRuntime.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotRuntime.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java b/jcl/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotThread.java b/jcl/src/java.management/share/classes/sun/management/HotspotThread.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotThread.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotThread.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/HotspotThreadMBean.java b/jcl/src/java.management/share/classes/sun/management/HotspotThreadMBean.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/HotspotThreadMBean.java +++ b/jcl/src/java.management/share/classes/sun/management/HotspotThreadMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/LazyCompositeData.java b/jcl/src/java.management/share/classes/sun/management/LazyCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/LazyCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/LazyCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/LockInfoCompositeData.java b/jcl/src/java.management/share/classes/sun/management/LockInfoCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/LockInfoCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/LockInfoCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/jcl/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java +++ b/jcl/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MappedMXBeanType.java b/jcl/src/java.management/share/classes/sun/management/MappedMXBeanType.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MappedMXBeanType.java +++ b/jcl/src/java.management/share/classes/sun/management/MappedMXBeanType.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MemoryImpl.java b/jcl/src/java.management/share/classes/sun/management/MemoryImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MemoryImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/MemoryImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MemoryManagerImpl.java b/jcl/src/java.management/share/classes/sun/management/MemoryManagerImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MemoryManagerImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/MemoryManagerImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java b/jcl/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/MemoryNotifInfoCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MemoryPoolImpl.java b/jcl/src/java.management/share/classes/sun/management/MemoryPoolImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MemoryPoolImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/MemoryPoolImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java b/jcl/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/MemoryUsageCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MethodInfo.java b/jcl/src/java.management/share/classes/sun/management/MethodInfo.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MethodInfo.java +++ b/jcl/src/java.management/share/classes/sun/management/MethodInfo.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java b/jcl/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/MonitorInfoCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java b/jcl/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java +++ b/jcl/src/java.management/share/classes/sun/management/NotificationEmitterSupport.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/RuntimeImpl.java b/jcl/src/java.management/share/classes/sun/management/RuntimeImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/RuntimeImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/RuntimeImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/Sensor.java b/jcl/src/java.management/share/classes/sun/management/Sensor.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/Sensor.java +++ b/jcl/src/java.management/share/classes/sun/management/Sensor.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java b/jcl/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/StackTraceElementCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/ThreadImpl.java b/jcl/src/java.management/share/classes/sun/management/ThreadImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/ThreadImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/ThreadImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java b/jcl/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java +++ b/jcl/src/java.management/share/classes/sun/management/ThreadInfoCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/TypeVersionMapper.java b/jcl/src/java.management/share/classes/sun/management/TypeVersionMapper.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/TypeVersionMapper.java +++ b/jcl/src/java.management/share/classes/sun/management/TypeVersionMapper.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/VMManagement.java b/jcl/src/java.management/share/classes/sun/management/VMManagement.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/VMManagement.java +++ b/jcl/src/java.management/share/classes/sun/management/VMManagement.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/java.management/share/classes/sun/management/VMManagementImpl.java b/jcl/src/java.management/share/classes/sun/management/VMManagementImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/java.management/share/classes/sun/management/VMManagementImpl.java +++ b/jcl/src/java.management/share/classes/sun/management/VMManagementImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java index 9d78813d0a6..e94dadbbfaf 100644 --- a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java +++ b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9AttachProvider.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tools.attach.attacher; diff --git a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java index f1779a2bccb..9d276a8162d 100644 --- a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java +++ b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachine.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tools.attach.attacher; diff --git a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java index 85363b54582..c5f7ab960be 100644 --- a/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java +++ b/jcl/src/jdk.attach/share/classes/com/ibm/tools/attach/attacher/OpenJ9VirtualMachineDescriptor.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/jcl/src/jdk.attach/share/classes/module-info.java.extra b/jcl/src/jdk.attach/share/classes/module-info.java.extra index ee03072364f..c63fd9186e8 100644 --- a/jcl/src/jdk.attach/share/classes/module-info.java.extra +++ b/jcl/src/jdk.attach/share/classes/module-info.java.extra @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ provides com.sun.tools.attach.spi.AttachProvider with com.ibm.tools.attach.attacher.OpenJ9AttachProvider; diff --git a/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java b/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java index f5152fd96a0..11ab6f2dd38 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.foreign.abi; diff --git a/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java b/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java index 9524a3b9728..15c8000e6f6 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.internal.foreign.abi; diff --git a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java index 92fcc3f50c3..3d6059dd611 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[ENDIF] Final copyright notice is included. */ /*[#INCLUDE ../../../../../../../java.base/share/classes/openj9/internal/foreign/abi/InternalDowncallHandler.java]*/ diff --git a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java index 444fd5e5261..947ac83cb75 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[ENDIF] Final copyright notice is included. */ /*[#INCLUDE ../../../../../../../java.base/share/classes/openj9/internal/foreign/abi/InternalUpcallHandler.java]*/ diff --git a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java index c5804d232c9..d2bb22b849b 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[ENDIF] Final copyright notice is included. */ /*[#INCLUDE ../../../../../../../java.base/share/classes/openj9/internal/foreign/abi/LayoutStrPreprocessor.java]*/ diff --git a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/TypeLayoutCheckHelper.java b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/TypeLayoutCheckHelper.java index 51f1188b332..f57b24a9fc9 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/TypeLayoutCheckHelper.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/TypeLayoutCheckHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.internal.foreign.abi; diff --git a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java index 4d4838161cc..8f0097796ac 100644 --- a/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java +++ b/jcl/src/jdk.incubator.foreign/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[ENDIF] Final copyright notice is included. */ /*[#INCLUDE ../../../../../../../java.base/share/classes/openj9/internal/foreign/abi/UpcallMHMetaData.java]*/ diff --git a/jcl/src/jdk.jcmd/share/classes/module-info.java b/jcl/src/jdk.jcmd/share/classes/module-info.java index cd33d0807fa..1ad83bc90e7 100644 --- a/jcl/src/jdk.jcmd/share/classes/module-info.java +++ b/jcl/src/jdk.jcmd/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java index 40e025f95ce..78280cc843c 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/attacher/AttacherDiagnosticsProvider.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.attacher; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java index cb145b7f277..b43e7953f71 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jcmd.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.tools; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java index b0dff9c51ca..0cce7406b4b 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jmap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.tools; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jps.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jps.java index 8d3c40067cd..c5aaabcacc1 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jps.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jps.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.tools; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java index e19d7475276..c350d4fe6b8 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstack.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.tools; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstat.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstat.java index 611d7202c44..64bbe1b68f0 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstat.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Jstat.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.tools; diff --git a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java index 59876a2442c..fe1f409b809 100644 --- a/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java +++ b/jcl/src/jdk.jcmd/share/classes/openj9/tools/attach/diagnostics/tools/Util.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.tools.attach.diagnostics.tools; diff --git a/jcl/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java b/jcl/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java index 664844b3d4a..1f237657b2f 100644 --- a/jcl/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java +++ b/jcl/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jdk.tools.jlink.internal.plugins; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/AvailableProcessorsNotificationInfo.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/AvailableProcessorsNotificationInfo.java index 8a67c0f65d4..b0c556b86e4 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/AvailableProcessorsNotificationInfo.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/AvailableProcessorsNotificationInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/CpuLoadCalculationConstants.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/CpuLoadCalculationConstants.java index 0b774336df4..8a6bac3958a 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/CpuLoadCalculationConstants.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/CpuLoadCalculationConstants.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ExtendedThreadInfo.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ExtendedThreadInfo.java index 3e0063e7fab..3fad985f3fa 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ExtendedThreadInfo.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ExtendedThreadInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/GarbageCollectorMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/GarbageCollectorMXBean.java index 70b94ccc076..ed2ec4ca9b5 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/GarbageCollectorMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/GarbageCollectorMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorInfo.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorInfo.java index 7fb929dcd0a..121d672e38b 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorInfo.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorMXBean.java index 94bc6e01e89..b6d993dff69 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/JvmCpuMonitorMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryMXBean.java index c14ca4818ba..02066c80bf5 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryPoolMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryPoolMXBean.java index a6918375b1a..bbecdc46037 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryPoolMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryPoolMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsage.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsage.java index b81557f0c1a..2616e28b3d7 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsage.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsageRetrievalException.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsageRetrievalException.java index c50b600c246..56601a096ae 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsageRetrievalException.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/MemoryUsageRetrievalException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/OperatingSystemMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/OperatingSystemMXBean.java index 29b851f4b12..e5b0f9b17d9 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/OperatingSystemMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/OperatingSystemMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessingCapacityNotificationInfo.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessingCapacityNotificationInfo.java index 51763bd74b0..c6f45c8465b 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessingCapacityNotificationInfo.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessingCapacityNotificationInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsage.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsage.java index 8124cf7ab7c..e4450d27d85 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsage.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsageRetrievalException.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsageRetrievalException.java index 877f897bb87..93739cfd4a4 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsageRetrievalException.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ProcessorUsageRetrievalException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/RuntimeMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/RuntimeMXBean.java index f3c83b41105..faf87142a74 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/RuntimeMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/RuntimeMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ThreadMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ThreadMXBean.java index 0280e8de366..6310772e601 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ThreadMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/ThreadMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/TotalPhysicalMemoryNotificationInfo.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/TotalPhysicalMemoryNotificationInfo.java index 772672e74cd..dc41ddca68e 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/TotalPhysicalMemoryNotificationInfo.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/TotalPhysicalMemoryNotificationInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/UnixOperatingSystemMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/UnixOperatingSystemMXBean.java index e8474e4e4f5..441b667546a 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/UnixOperatingSystemMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/UnixOperatingSystemMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/AvailableProcessorsNotificationInfoUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/AvailableProcessorsNotificationInfoUtil.java index 8a3f6cb0044..9baf8373c99 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/AvailableProcessorsNotificationInfoUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/AvailableProcessorsNotificationInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedGarbageCollectorMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedGarbageCollectorMXBeanImpl.java index aff7359b0e9..e3dd58c5435 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedGarbageCollectorMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedGarbageCollectorMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedMemoryMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedMemoryMXBeanImpl.java index 218a94885e2..6b5f568570c 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedMemoryMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedMemoryMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java index 213d62bb8fd..6cf1a32adfe 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedOperatingSystemMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java index 935b917ed10..90d96f31a11 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedRuntimeMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadInfoImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadInfoImpl.java index 76d5d261581..bf14c6f90f5 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadInfoImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadInfoImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadMXBeanImpl.java index 0c69bd85d2d..27a465c2af1 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ExtendedThreadMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitor.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitor.java index 03e5678678e..d6af6011817 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitor.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitorInfoUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitorInfoUtil.java index 151f99e74d1..ba199c2a6f4 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitorInfoUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/JvmCpuMonitorInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThread.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThread.java index 377afd1a0c1..630d75603a3 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThread.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThreadShutdown.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThreadShutdown.java index ee6353623ed..d8c6c19c8d4 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThreadShutdown.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryNotificationThreadShutdown.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryPoolMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryPoolMXBeanImpl.java index c00b4f7767e..772f061c4a1 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryPoolMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryPoolMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryUsageUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryUsageUtil.java index 4cb38c0ef56..3a85e9661dd 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryUsageUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/MemoryUsageUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OpenTypeMappingIHandler.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OpenTypeMappingIHandler.java index 025cdb97289..3023eae815d 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OpenTypeMappingIHandler.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OpenTypeMappingIHandler.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThread.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThread.java index 61ac3f57af6..b776a6fab0a 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThread.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThreadShutdown.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThreadShutdown.java index b3adfc1d792..af7100dbc8f 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThreadShutdown.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/OperatingSystemNotificationThreadShutdown.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java index 6f718855574..8cc251c5d6f 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/PlatformMBeanProvider.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessingCapacityNotificationInfoUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessingCapacityNotificationInfoUtil.java index 57a605677df..c917f0be6ca 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessingCapacityNotificationInfoUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessingCapacityNotificationInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessorUsageUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessorUsageUtil.java index f9532285d26..9e3865adda5 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessorUsageUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/ProcessorUsageUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/TotalPhysicalMemoryNotificationInfoUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/TotalPhysicalMemoryNotificationInfoUtil.java index 1124a81af60..3b1e9fa7747 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/TotalPhysicalMemoryNotificationInfoUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/TotalPhysicalMemoryNotificationInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/UnixExtendedOperatingSystem.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/UnixExtendedOperatingSystem.java index 74dc425f29f..5de276b66e8 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/UnixExtendedOperatingSystem.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/internal/UnixExtendedOperatingSystem.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/package-info.java b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/package-info.java index fe4e1502dbf..70bdbffc559 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/lang/management/package-info.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/lang/management/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSInfoRetrievalException.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSInfoRetrievalException.java index c0d441065cf..00335e03fc8 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSInfoRetrievalException.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSInfoRetrievalException.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMXBean.java index 853c1fa2529..6273326677b 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMXBean.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.management.*; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMemoryUsage.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMemoryUsage.java index db573516088..bc9d96766a0 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMemoryUsage.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSMemoryUsage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSProcessorUsage.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSProcessorUsage.java index 9d6e88f8586..0e72cd2483f 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSProcessorUsage.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/GuestOSProcessorUsage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorInfoRetrievalException.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorInfoRetrievalException.java index 64d0eafd113..4b0b263847e 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorInfoRetrievalException.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorInfoRetrievalException.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorMXBean.java index 41a9f134055..7299e1e8177 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOS.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOS.java index 71edde96bf7..4bd4966af4a 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOS.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOS.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSMemoryUsageUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSMemoryUsageUtil.java index 580dea85ee5..799ff7b71bd 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSMemoryUsageUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSMemoryUsageUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSProcessorUsageUtil.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSProcessorUsageUtil.java index b0efa2f3da0..1ab6888b853 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSProcessorUsageUtil.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/GuestOSProcessorUsageUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/HypervisorMXBeanImpl.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/HypervisorMXBeanImpl.java index 222b8904206..f7ebe9d7d5e 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/HypervisorMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/internal/HypervisorMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.virtualization.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/package-info.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/package-info.java index 339ff7cda82..b90a0b43c18 100644 --- a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/package-info.java +++ b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java b/jcl/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java index 84ed6c0d3d4..3268f0c093a 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/DiagnosticCommandMBean.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java b/jcl/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java index 3eba16e241f..d9ea6ab40e4 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.sun.management; diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/GcInfo.java b/jcl/src/jdk.management/share/classes/com/sun/management/GcInfo.java index 57dbb745589..4375453b684 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/GcInfo.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/GcInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.sun.management; diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/jcl/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java index 3ccfff28638..e7c771514c0 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.sun.management; diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/VMOption.java b/jcl/src/jdk.management/share/classes/com/sun/management/VMOption.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/VMOption.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/VMOption.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandArgumentInfo.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/DiagnosticCommandInfo.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/Flag.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/Flag.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/Flag.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/Flag.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotifInfoCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotificationInfoUtil.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotificationInfoUtil.java index f624ea6976d..c325c91d492 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotificationInfoUtil.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectionNotificationInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.sun.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GarbageCollectorExtImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoUtil.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoUtil.java index f54c7e54539..954fd9be1bd 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoUtil.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/GcInfoUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.sun.management.internal; diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotDiagnostic.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/HotSpotThreadImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/PlatformMBeanProviderImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java b/jcl/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/internal/VMOptionCompositeData.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/package-info.java b/jcl/src/jdk.management/share/classes/com/sun/management/package-info.java index de2dfe4366f..784471150ad 100644 --- a/jcl/src/jdk.management/share/classes/com/sun/management/package-info.java +++ b/jcl/src/jdk.management/share/classes/com/sun/management/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.management/share/classes/module-info.java.extra b/jcl/src/jdk.management/share/classes/module-info.java.extra index e9b9a92c518..27af2932741 100644 --- a/jcl/src/jdk.management/share/classes/module-info.java.extra +++ b/jcl/src/jdk.management/share/classes/module-info.java.extra @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ exports com.ibm.lang.management; diff --git a/jcl/src/jdk.management/share/classes/openj9/lang/management/ConfigurationUnavailableException.java b/jcl/src/jdk.management/share/classes/openj9/lang/management/ConfigurationUnavailableException.java index 337ab563017..7e36bbf1d86 100644 --- a/jcl/src/jdk.management/share/classes/openj9/lang/management/ConfigurationUnavailableException.java +++ b/jcl/src/jdk.management/share/classes/openj9/lang/management/ConfigurationUnavailableException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.lang.management; diff --git a/jcl/src/jdk.management/share/classes/openj9/lang/management/InvalidOptionException.java b/jcl/src/jdk.management/share/classes/openj9/lang/management/InvalidOptionException.java index 40be6af1176..f4ea8e0ac40 100644 --- a/jcl/src/jdk.management/share/classes/openj9/lang/management/InvalidOptionException.java +++ b/jcl/src/jdk.management/share/classes/openj9/lang/management/InvalidOptionException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.lang.management; diff --git a/jcl/src/jdk.management/share/classes/openj9/lang/management/OpenJ9DiagnosticsMXBean.java b/jcl/src/jdk.management/share/classes/openj9/lang/management/OpenJ9DiagnosticsMXBean.java index 30b03d405ba..66a97706929 100644 --- a/jcl/src/jdk.management/share/classes/openj9/lang/management/OpenJ9DiagnosticsMXBean.java +++ b/jcl/src/jdk.management/share/classes/openj9/lang/management/OpenJ9DiagnosticsMXBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/share/classes/openj9/lang/management/internal/OpenJ9DiagnosticsMXBeanImpl.java b/jcl/src/jdk.management/share/classes/openj9/lang/management/internal/OpenJ9DiagnosticsMXBeanImpl.java index 0368ab3e728..ba1ffed4591 100644 --- a/jcl/src/jdk.management/share/classes/openj9/lang/management/internal/OpenJ9DiagnosticsMXBeanImpl.java +++ b/jcl/src/jdk.management/share/classes/openj9/lang/management/internal/OpenJ9DiagnosticsMXBeanImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package openj9.lang.management.internal; diff --git a/jcl/src/jdk.management/share/classes/openj9/lang/management/package-info.java b/jcl/src/jdk.management/share/classes/openj9/lang/management/package-info.java index 68fd97fcde0..0f9bc88e170 100644 --- a/jcl/src/jdk.management/share/classes/openj9/lang/management/package-info.java +++ b/jcl/src/jdk.management/share/classes/openj9/lang/management/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java b/jcl/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java +++ b/jcl/src/jdk.management/unix/classes/com/sun/management/internal/OperatingSystemImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java b/jcl/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java index d3a155fc74e..f95258f7cad 100644 --- a/jcl/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java +++ b/jcl/src/jdk.management/windows/classes/com/sun/management/internal/OperatingSystemImpl.java @@ -19,5 +19,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/jcl/src/openj9.criu/share/classes/module-info.java b/jcl/src/openj9.criu/share/classes/module-info.java index 30383048577..dfb47a7331c 100644 --- a/jcl/src/openj9.criu/share/classes/module-info.java +++ b/jcl/src/openj9.criu/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * Defines an API for checkpointing the JVM using CRIU. diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUDumpPermission.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUDumpPermission.java index 075383a7e13..4da5b6115c3 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUDumpPermission.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUDumpPermission.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java index 84a576aac5b..3a8c294ad3f 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/J9InternalCheckpointHookAPI.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/J9InternalCheckpointHookAPI.java index 7aba338c3dd..59e82adbdb2 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/J9InternalCheckpointHookAPI.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/J9InternalCheckpointHookAPI.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCRIUException.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCRIUException.java index b275b34700c..8ac077e538c 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCRIUException.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCRIUException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCheckpointException.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCheckpointException.java index 32d18724be7..f0729972c59 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCheckpointException.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMCheckpointException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMRestoreException.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMRestoreException.java index 218f20abee1..de65de56e8d 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMRestoreException.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/JVMRestoreException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SecurityProviders.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SecurityProviders.java index 9ac2f4ea379..c0f2fc93404 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SecurityProviders.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SecurityProviders.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemCheckpointException.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemCheckpointException.java index c3b5afa2f43..d7bab2fa106 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemCheckpointException.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemCheckpointException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemRestoreException.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemRestoreException.java index bad18d1626b..275bf0cca08 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemRestoreException.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/SystemRestoreException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.eclipse.openj9.criu; diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/package-info.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/package-info.java index 8a96d3ab765..7939a767750 100644 --- a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/package-info.java +++ b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Cuda.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Cuda.java index f5587c221d2..61224efeccc 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Cuda.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Cuda.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaBuffer.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaBuffer.java index a01f015e0a5..3784cd72ddc 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaBuffer.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaDevice.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaDevice.java index ed0dccea5f3..9a1e8595794 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaDevice.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaDevice.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaError.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaError.java index dfbdefb19ad..b0ecde8aca5 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaError.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaError.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaEvent.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaEvent.java index 5bec62342c3..f07d2c8e0dc 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaEvent.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaEvent.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaException.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaException.java index 0b3fb815b40..561e973695a 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaException.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaFunction.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaFunction.java index 41f2cc2a746..f26e7a41be2 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaFunction.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaFunction.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGlobal.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGlobal.java index 409c4b9cd64..37110ec183a 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGlobal.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGlobal.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGrid.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGrid.java index 99b8bfd073c..1d3744f505d 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGrid.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaGrid.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitInputType.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitInputType.java index abbc13fab51..effd0e99650 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitInputType.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitInputType.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitOptions.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitOptions.java index 7df6acf5c55..78d274f96f8 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitOptions.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitOptions.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitTarget.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitTarget.java index 3ed2c91d680..b45338fb332 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitTarget.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaJitTarget.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaKernel.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaKernel.java index e4ff614e632..b0e3c793b10 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaKernel.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaKernel.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaLinker.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaLinker.java index c68e8529453..cec185f54af 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaLinker.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaLinker.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaModule.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaModule.java index 705d4f6cc9e..e703945580b 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaModule.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaModule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaPermission.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaPermission.java index 5cfb4255c47..2b601307103 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaPermission.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaPermission.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaStream.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaStream.java index 4d49fe1b439..811c8d090e0 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaStream.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaSurface.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaSurface.java index e2e4b9f8854..7ff365cd5c1 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaSurface.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaSurface.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaTexture.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaTexture.java index 126fa4c0440..e9281d7ab61 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaTexture.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/CudaTexture.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Dim3.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Dim3.java index 364e8db12f4..6275604fed0 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Dim3.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/Dim3.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/internal/CudaUtil.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/internal/CudaUtil.java index 0365ffbfd20..c2f01799660 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/internal/CudaUtil.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/internal/CudaUtil.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.cuda.internal; diff --git a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/package-info.java b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/package-info.java index c4adc49a1e2..94e5eb7709b 100644 --- a/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/package-info.java +++ b/jcl/src/openj9.cuda/share/classes/com/ibm/cuda/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.cuda/share/classes/module-info.java b/jcl/src/openj9.cuda/share/classes/module-info.java index 18279f489c1..35b141b35c9 100644 --- a/jcl/src/openj9.cuda/share/classes/module-info.java +++ b/jcl/src/openj9.cuda/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayMarshaller.java b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayMarshaller.java index 8732ccce708..4f0d2c2fdb4 100644 --- a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayMarshaller.java +++ b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayMarshaller.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dataaccess; diff --git a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayUnmarshaller.java b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayUnmarshaller.java index ad47b2d7511..65cd2edf529 100644 --- a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayUnmarshaller.java +++ b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/ByteArrayUnmarshaller.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dataaccess; diff --git a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/CommonData.java b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/CommonData.java index f4232bcc038..d2c2a9dbc89 100644 --- a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/CommonData.java +++ b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/CommonData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dataaccess; diff --git a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/DecimalData.java b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/DecimalData.java index d7388501063..1735fecb8b7 100644 --- a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/DecimalData.java +++ b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/DecimalData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dataaccess; diff --git a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/PackedDecimal.java b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/PackedDecimal.java index d7b3b065f1c..20c284bffcb 100644 --- a/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/PackedDecimal.java +++ b/jcl/src/openj9.dataaccess/share/classes/com/ibm/dataaccess/PackedDecimal.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dataaccess; diff --git a/jcl/src/openj9.dataaccess/share/classes/module-info.java b/jcl/src/openj9.dataaccess/share/classes/module-info.java index 336f203cb78..defb3e0e288 100644 --- a/jcl/src/openj9.dataaccess/share/classes/module-info.java +++ b/jcl/src/openj9.dataaccess/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/CommonAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/CommonAddressSpace.java index 1a95e14eb4f..2d9ffdd796a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/CommonAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/CommonAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.addressspace; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/DumpReaderAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/DumpReaderAddressSpace.java index 8dc5b854e4a..ce60324e4ce 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/DumpReaderAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/DumpReaderAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.addressspace; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/IAbstractAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/IAbstractAddressSpace.java index fbd80739911..811a00d9b06 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/IAbstractAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/IAbstractAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.addressspace; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/LayeredAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/LayeredAddressSpace.java index e1d5400baaf..a93817a63c3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/LayeredAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/LayeredAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.addressspace; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/SimpleAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/SimpleAddressSpace.java index 2e4bff6bdaf..a9ca2710c72 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/SimpleAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/addressspace/SimpleAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.addressspace; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/ARReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/ARReader.java index 3cd92c5577d..25c6058a488 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/ARReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/ARReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.binaryreaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/XCOFFReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/XCOFFReader.java index 55fdb4d81de..c6042d45480 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/XCOFFReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/binaryreaders/XCOFFReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.binaryreaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix32Dump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix32Dump.java index dc784722ac8..f83be95af5c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix32Dump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix32Dump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix64Dump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix64Dump.java index af2e873360c..2146555fb11 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix64Dump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Aix64Dump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Builder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Builder.java index de7d1239643..3ff4a896a69 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Builder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Builder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ClosingFileReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ClosingFileReader.java index 840f65d8bf9..0faee03d810 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ClosingFileReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ClosingFileReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CoreReaderSupport.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CoreReaderSupport.java index 7277b811d3f..abba0c95df7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CoreReaderSupport.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CoreReaderSupport.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CorruptCoreException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CorruptCoreException.java index ad8981f0bb9..1d8c9445417 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CorruptCoreException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/CorruptCoreException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Dump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Dump.java index f1dd4f33b18..4bee601727f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Dump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Dump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpException.java index d727c490398..58098ffabbf 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpFactory.java index 70292d4288c..e30f2660c52 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpReader.java index ad9134aa9c7..fd1f378445f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/DumpReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/GenericThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/GenericThread.java index b179232a8dd..ec58e385a44 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/GenericThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/GenericThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ICoreFileReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ICoreFileReader.java index c12c6afc6dc..859a991de1c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ICoreFileReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ICoreFileReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/J9RASReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/J9RASReader.java index 135dfd0d160..abcd18fee4f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/J9RASReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/J9RASReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/LittleEndianDumpReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/LittleEndianDumpReader.java index 509ba418f4c..a64c909e5c3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/LittleEndianDumpReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/LittleEndianDumpReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryAccessException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryAccessException.java index 919dfe6449a..ad8390af103 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryAccessException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryAccessException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryRange.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryRange.java index c09744558d0..5bcac56f2ec 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryRange.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/MemoryRange.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NativeThreadContext.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NativeThreadContext.java index 6b45340d560..67071fdcf24 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NativeThreadContext.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NativeThreadContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewAixDump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewAixDump.java index f5afebf37f7..b68ca98d93f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewAixDump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewAixDump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewElfDump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewElfDump.java index 2f81b646c89..1045f0de3dd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewElfDump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewElfDump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewWinDump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewWinDump.java index 4ec7965f080..f73834a3a4b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewWinDump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewWinDump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewZosDump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewZosDump.java index 66775cc9aaf..e4652210111 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewZosDump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/NewZosDump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/PageCache.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/PageCache.java index 175929bb835..12beeb7afc9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/PageCache.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/PageCache.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Register.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Register.java index 42c43bfab42..5d18dcff403 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Register.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Register.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ResourceReleaser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ResourceReleaser.java index 990d3f94f7b..5d9e6e4a8d1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ResourceReleaser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/ResourceReleaser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/StackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/StackFrame.java index bd182de7c76..87db46d98f2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/StackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/StackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Symbol.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Symbol.java index 1b48552ea65..d78d7e0873d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Symbol.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/Symbol.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RAS.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RAS.java index 062ed3c2783..bc35b7de0ea 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RAS.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RAS.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragment.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragment.java index fa92947c493..c6e4f46afe5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragment.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragment.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5GA.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5GA.java index 5571bfa77b8..5c0270e5934 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5GA.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5GA.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5SR10.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5SR10.java index 30673e8f9d2..17f05fecd2d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5SR10.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5SR10.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5v2.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5v2.java index e7434b1472a..e1201d92bad 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5v2.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ5v2.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6GA.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6GA.java index 2159600a2a2..3bbed887b4f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6GA.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6GA.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6SR6.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6SR6.java index 3a1d57cd09f..4e3744a0bab 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6SR6.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6SR6.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v2.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v2.java index 3655508b62f..ce1b1ab7aa2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v2.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v2.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v3.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v3.java index 7d3e80b0f22..074950fb60f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v3.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/J9RASFragmentJ6v3.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/Memory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/Memory.java index 775f57a3c0f..dbd8d4c7590 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/Memory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/j9/Memory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressRange.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressRange.java index fb4afe21290..1ff3812264c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressRange.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressRange.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.dumpreader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpace.java index 81c72a33ea6..6c1fa06d890 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.dumpreader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpaceImageInputStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpaceImageInputStream.java index 83e1cf2788d..43c6ee5f2b2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpaceImageInputStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/AddressSpaceImageInputStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.dumpreader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/Dump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/Dump.java index edcb2fab0bc..67b78020373 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/Dump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/Dump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.dumpreader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/SearchListener.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/SearchListener.java index 94e53152d1d..2b547cca996 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/SearchListener.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/dumpreader/SearchListener.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.dumpreader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa.java index 576076cbcdc..c000379f433 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32Template.java index 998d1114c8c..3150c6017dc 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32_11Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32_11Template.java index 1ca4db45507..ac3e16c38d1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32_11Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa32_11Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64Template.java index 5efd8b1d5cd..c451bc5bb0a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64_11Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64_11Template.java index 92af14529d6..f34d5ebe8dc 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64_11Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Caa64_11Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaNotFound.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaNotFound.java index c2aca9c779d..4c134e7cc37 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaNotFound.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaNotFound.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaTemplate.java index fd06cb32d3b..6e61263ace8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CaaTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsaTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsaTemplate.java index 38621621e7e..ddb201d2ef5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsaTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsaTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp32Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp32Template.java index a29005d2e58..2c916559573 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp32Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp32Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp64Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp64Template.java index 363e980c653..6bd2ae48ecb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp64Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp64Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsahpTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsahpTemplate.java index 3a0e0b9587b..8a3df39786a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsahpTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeedsahpTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp_transitionTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp_transitionTemplate.java index aa73f8e0324..cc8c46945aa 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp_transitionTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceedsahp_transitionTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeelcaTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeelcaTemplate.java index e033913eeb0..edf1b307fb8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeelcaTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeelcaTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibTemplate.java index 84b0dce802e..b8bbe16de0d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibhTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibhTemplate.java index f6f5fff5982..383d95e30a4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibhTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexcibhTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb32Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb32Template.java index 070f70058da..f1cb4017885 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb32Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb32Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb64Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb64Template.java index d0c492a9398..c66455378a8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb64Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexdlcb64Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexdlcbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexdlcbTemplate.java index dc1a33c8de9..d7638a15a01 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexdlcbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexdlcbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb32Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb32Template.java index 40cc5315101..9fed76044ba 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb32Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb32Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb64Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb64Template.java index d0dd66a466c..334e4b051b1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb64Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexedb64Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexedbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexedbTemplate.java index d96c71596f6..38c619698a6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexedbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexedbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom32Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom32Template.java index 0e45b31b0a7..a4aa396f743 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom32Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom32Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom64Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom64Template.java index b5d4c2e4a65..cae75113f6d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom64Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhcom64Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhcomTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhcomTemplate.java index edbf5041ab3..0850d466a47 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhcomTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhcomTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhepvTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhepvTemplate.java index 8852837f04d..2131c1eacf6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhepvTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexhepvTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhp1bTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhp1bTemplate.java index e03dc55bc9c..043f6cadfcb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhp1bTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexhp1bTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexlaaTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexlaaTemplate.java index 74f75197057..abea33e08b3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexlaaTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexlaaTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexoepvTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexoepvTemplate.java index 09584b5fa93..403e04667e0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexoepvTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexoepvTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexpp1bTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexpp1bTemplate.java index 0721dd6f506..c3fac2627bb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexpp1bTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexpp1bTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb32Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb32Template.java index 388af590062..5e238f86100 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb32Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb32Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb64Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb64Template.java index 71c594abd8f..51b4d1c2424 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb64Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ceexrcb64Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexrcbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexrcbTemplate.java index b09cb44e2f8..3cfd6f82143 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexrcbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexrcbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexsfxmTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexsfxmTemplate.java index 5cfdc0c6350..b14a1d4be9c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexsfxmTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexsfxmTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexstkhTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexstkhTemplate.java index 489ea5e5336..0fe6618d1f9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexstkhTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeexstkhTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbTemplate.java index cccb8480203..1cf815e79d3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbeTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbeTemplate.java index f154ccdccb4..aa4c5d7d816 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbeTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CeextvbeTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpFuncEntryTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpFuncEntryTemplate.java index c07c59074d0..c5ac9842396 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpFuncEntryTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpFuncEntryTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpVarEntryTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpVarEntryTemplate.java index 1a9d5e274a3..6d52210e93d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpVarEntryTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2ExpVarEntryTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2Template.java index 5c223e2d001..86cc2548543 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Ciet2Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietExpEntryTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietExpEntryTemplate.java index bcc7876fdb2..963254e0601 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietExpEntryTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietExpEntryTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietTemplate.java index 281545fad87..f5eb5c261c1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/CietTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Dll.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Dll.java index 19fbfb6e19f..38c2875bd32 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Dll.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Dll.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllFunction.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllFunction.java index 9d45b546763..8f25652838a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllFunction.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllFunction.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllVariable.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllVariable.java index d4ecb541600..6ef7e8a2c93 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllVariable.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllVariable.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllcsectTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllcsectTemplate.java index 0077368168d..37094584450 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllcsectTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllcsectTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpfuncsTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpfuncsTemplate.java index 7f7c38028e6..a11c3f07c16 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpfuncsTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpfuncsTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpvarsTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpvarsTemplate.java index f7efe003173..63982ae50f5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpvarsTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DllexpvarsTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DsaStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DsaStackFrame.java index 9989f2547ee..d73efcf924a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DsaStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/DsaStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Edb.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Edb.java index dba558f555d..af3bbbaefa6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Edb.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Edb.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Function.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Function.java index 49837071f42..90b27eabd5d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Function.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/Function.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/SmcbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/SmcbTemplate.java index 2b18c3e2dc9..46fc82b2aa1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/SmcbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/SmcbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/StackNotFound.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/StackNotFound.java index 5f91ad65ed3..34c14206a03 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/StackNotFound.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/le/StackNotFound.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.le; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzotcbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzotcbTemplate.java index 05f97c6f7f0..e1d937ae8e9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzotcbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzotcbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzustaTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzustaTemplate.java index b6e445b0234..c4550ec44d8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzustaTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/BpxzustaTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/CeexcvtTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/CeexcvtTemplate.java index 24ae164c507..dc9116451f6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/CeexcvtTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/CeexcvtTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaascbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaascbTemplate.java index b57d930bc00..30f734a46ba 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaascbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaascbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaasxbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaasxbTemplate.java index f2f7221f8d8..b8b8116f864 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaasxbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhaasxbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhapsaTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhapsaTemplate.java index 0b6292f2f7e..7a33bb74dd5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhapsaTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhapsaTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IharbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IharbTemplate.java index 7518122ef92..331273d8c04 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IharbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IharbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Ihartm2aTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Ihartm2aTemplate.java index ffa660a8e3c..cf2bba84cb3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Ihartm2aTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Ihartm2aTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhastcbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhastcbTemplate.java index 493e6c8f658..9ae70db7ffd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhastcbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IhastcbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjrbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjrbTemplate.java index d39da0c4464..8427b6fd068 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjrbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjrbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjtcbTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjtcbTemplate.java index 1abded4c001..c95c608deff 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjtcbTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/IkjtcbTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lse.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lse.java index 19afc55f745..dc6cff496c0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lse.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lse.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsedTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsedTemplate.java index 36d0927ae02..97f6463b798 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsedTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsedTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lses1lsed1Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lses1lsed1Template.java index 56650222f0c..3932682d294 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lses1lsed1Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lses1lsed1Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LseslsedTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LseslsedTemplate.java index bf0fb6ed9f0..4a88f97279d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LseslsedTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LseslsedTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lsestate1Template.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lsestate1Template.java index 735fc41b59f..d164972344c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lsestate1Template.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Lsestate1Template.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsestateTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsestateTemplate.java index 1c6ef44e953..9f311f8fb44 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsestateTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/LsestateTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/OtcbcopyonforkTemplate.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/OtcbcopyonforkTemplate.java index e14d230f59c..ef13708eac1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/OtcbcopyonforkTemplate.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/OtcbcopyonforkTemplate.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/RegisterSet.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/RegisterSet.java index 039d3a29a47..8700a268767 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/RegisterSet.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/RegisterSet.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Tcb.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Tcb.java index 78778bae8c8..74598f9cc95 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Tcb.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/mvs/Tcb.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.mvs; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractHashMap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractHashMap.java index 50c91617d0a..2817c96a2a2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractHashMap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractHashMap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractLruCache.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractLruCache.java index 5765cf541c8..9210406c40c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractLruCache.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/AbstractLruCache.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/BitStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/BitStream.java index 7e824cfce77..90977b43238 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/BitStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/BitStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CharConversion.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CharConversion.java index 98b24c02a2c..9a82e8a694b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CharConversion.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CharConversion.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/Clib.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/Clib.java index f8604c07dd9..4771a3b0790 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/Clib.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/Clib.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CompressedRecordArray.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CompressedRecordArray.java index b2e08d4b82a..9fa7cc4e057 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CompressedRecordArray.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/CompressedRecordArray.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntEnumeration.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntEnumeration.java index 7dd8ea6ec79..3b56b8a1e5e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntEnumeration.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntEnumeration.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntegerMap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntegerMap.java index 60a632c1015..4da1bcff8ce 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntegerMap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/IntegerMap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectLruCache.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectLruCache.java index ce4ece7b70f..cfb1ad9b414 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectLruCache.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectLruCache.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectMap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectMap.java index 459bff4bed6..7817911c7b4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectMap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/corereaders/zos/util/ObjectMap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.corereaders.zos.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptData.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptData.java index 8703f4a69a7..2b4034f15e7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptData.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptDataException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptDataException.java index 6adff542c89..b762bcbda6c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptDataException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/CorruptDataException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DTFJException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DTFJException.java index f0a8312cbbc..76916bb1c1a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DTFJException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DTFJException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DataUnavailable.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DataUnavailable.java index 60756c15be6..40d4208b3b0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DataUnavailable.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/DataUnavailable.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/Image.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/Image.java index 434677bdc38..f8bbb8516a3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/Image.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/Image.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageAddressSpace.java index ff0323d7172..5ebe6f22caa 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageFactory.java index 2c8df2ff409..04943fb0e1b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageModule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageModule.java index f744de1629e..064456d1d6c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageModule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageModule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImagePointer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImagePointer.java index 6d5e3d35dd1..afb8fb81a4d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImagePointer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImagePointer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageProcess.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageProcess.java index 0a3e68ab4fd..b003a785bb4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageProcess.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageProcess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageRegister.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageRegister.java index 8e727db42b0..7dbd5bcd90c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageRegister.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageRegister.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSection.java index fe79a9979ce..81dfeac5ba2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageStackFrame.java index 01940920280..f66b9d06762 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSymbol.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSymbol.java index b5bb7cd40d1..478e030f0f8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSymbol.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageSymbol.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageThread.java index ca15a7a17da..b920a989f95 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/ImageThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/MemoryAccessException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/MemoryAccessException.java index 15db96451d9..9d78658582a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/MemoryAccessException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/MemoryAccessException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Builder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Builder.java index e51c768f20c..3d87fcf9ea6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Builder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Builder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BuilderShutdownHook.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BuilderShutdownHook.java index f5ab2f7d612..718db68fec0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BuilderShutdownHook.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BuilderShutdownHook.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BytecodeImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BytecodeImageSection.java index 25007d75783..7450be51d56 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BytecodeImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/BytecodeImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/CorruptData.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/CorruptData.java index 453a903e03c..1ba2056deca 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/CorruptData.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/CorruptData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DTFJImageFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DTFJImageFactory.java index c0c540c6ec7..b70904e040d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DTFJImageFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DTFJImageFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DefaultFileLocationResolver.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DefaultFileLocationResolver.java index 481c5d49522..95f5e1b21f6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DefaultFileLocationResolver.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/DefaultFileLocationResolver.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/FutureImplementation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/FutureImplementation.java index d23c629065e..73c008ea946 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/FutureImplementation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/FutureImplementation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/IFileLocationResolver.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/IFileLocationResolver.java index efe30343e2e..7a8bb0c9cd0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/IFileLocationResolver.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/IFileLocationResolver.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Image.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Image.java index a2345f35c20..e56cc912168 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Image.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/Image.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageAddressSpace.java index ae82bfd1b03..a989be86138 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageFactory.java index 779e7db90e8..fb391dfabbe 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageModule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageModule.java index 1941cb4dc05..95b677cbe03 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageModule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageModule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImagePointer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImagePointer.java index 8c8ae5fbe0b..06063651967 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImagePointer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImagePointer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageProcess.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageProcess.java index 67f4dd378f4..f9c15aefa2f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageProcess.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageProcess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageRegister.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageRegister.java index eb68a4e3412..539169962bb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageRegister.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageRegister.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSection.java index 0c7e1e51fab..e63b7b5007d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageStackFrame.java index 02384d7bb0e..4668d4ce94a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSymbol.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSymbol.java index 47352873be1..9b7337a3cc0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSymbol.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageSymbol.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageThread.java index f8f43e6e3e5..fdc2c282a35 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ImageThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/JitImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/JitImageSection.java index 0fc1118fe48..18828c0eb67 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/JitImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/JitImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ModuleImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ModuleImageSection.java index d54907e53ec..bda2368006a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ModuleImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ModuleImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/PartialProcess.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/PartialProcess.java index 4c792b37e23..efce130773d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/PartialProcess.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/PartialProcess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/RawImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/RawImageSection.java index 16aad411b27..493ca0d6943 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/RawImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/RawImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ReleasingImage.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ReleasingImage.java index 3929f6cbbc6..ce111f177fb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ReleasingImage.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ReleasingImage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/SignalName.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/SignalName.java index cc0a1907e9e..9acfa0a1b4e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/SignalName.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/SignalName.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/StackImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/StackImageSection.java index c7a3c2cfb3c..361163455d9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/StackImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/StackImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ZipExtractionResolver.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ZipExtractionResolver.java index 37f6da56293..6936bba46ba 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ZipExtractionResolver.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/ZipExtractionResolver.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/corrupt/CorruptImagePointer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/corrupt/CorruptImagePointer.java index 324e5c6824e..c98f0a99625 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/corrupt/CorruptImagePointer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/j9/corrupt/CorruptImagePointer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.j9.corrupt; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/BuilderData.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/BuilderData.java index e6428923734..cd4210b529c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/BuilderData.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/BuilderData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCCorruptData.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCCorruptData.java index 7312b2fe559..3ca9fa6f9a4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCCorruptData.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCCorruptData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImage.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImage.java index 48653160e2d..6bb3354cc7e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImage.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageAddressSpace.java index 1b287e3a260..1a403fd000a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageFactory.java index 6729afe0547..5f7c50d7126 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageModule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageModule.java index f66b25a5b65..a49ff7a2b98 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageModule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageModule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImagePointer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImagePointer.java index 834be78b539..9ba519f06f5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImagePointer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImagePointer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageProcess.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageProcess.java index 5642acc29e0..5fc8d82805e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageProcess.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageProcess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageRegister.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageRegister.java index 6a254803764..6b45c3f8b30 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageRegister.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageRegister.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSection.java index d3f989456e7..469a7de12e5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageStackFrame.java index 51ef0310444..ceb8ecdd2db 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSymbol.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSymbol.java index bd8d133af0b..2feb674704d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSymbol.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageSymbol.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageThread.java index 74c641b7061..cdf0d5387a7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCImageThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCReleasingImage.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCReleasingImage.java index 9658de4d75e..ad8410cde39 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCReleasingImage.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/JCReleasingImage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/LookupKey.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/LookupKey.java index 5c59504d698..c6aadc7c56b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/LookupKey.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/javacore/LookupKey.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.image.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/package-info.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/package-info.java index d4830534902..ac64f718c0e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/package-info.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/image/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClass.java index 1e9d9a2dc3d..9bddcaf4b9f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClassLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClassLoader.java index dabafd1cc3a..6551bf2410a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClassLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaField.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaField.java index 95dcd8f6642..6b262a473b0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaField.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaField.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaHeap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaHeap.java index 4204248e57b..28445cbdeb7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaHeap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaHeap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaLocation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaLocation.java index 4422c745b1b..b08816ceeaa 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaLocation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaLocation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMember.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMember.java index cf90c2a3275..0b4d0687fc9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMember.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMember.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMethod.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMethod.java index 78200d176c3..6a207226685 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMethod.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMethod.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMonitor.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMonitor.java index b01f170a7b7..b05efe60121 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMonitor.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaObject.java index afc61327c31..7bc8408ebfd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaReference.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaReference.java index 2048b540f17..2055c13d45a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaReference.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaReference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntime.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntime.java index 33e211c50f2..48f55fd4eb6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntime.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntime.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemoryCategory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemoryCategory.java index b3c5d585365..8da19633fd9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemoryCategory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemoryCategory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemorySection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemorySection.java index 4909d5cab48..5d6db8e1901 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemorySection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaRuntimeMemorySection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaStackFrame.java index f3bd7a022a4..d0602a6a764 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaThread.java index bd0bead241a..a7fdc6381a5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMInitArgs.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMInitArgs.java index 10f8a59c0ef..241922e253a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMInitArgs.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMInitArgs.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMOption.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMOption.java index 415c40fb6e8..a1fcddc1278 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMOption.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/JavaVMOption.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaAbstractClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaAbstractClass.java index 2e9fe439b6f..fa4bc584d01 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaAbstractClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaAbstractClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaArrayClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaArrayClass.java index dff133834a2..7e69dd6cfb5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaArrayClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaArrayClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClass.java index 7b7dc5f16c4..d9e8fc45f7c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClassLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClassLoader.java index 0ee7503cc3a..32d1b38f46e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClassLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaField.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaField.java index 36837125d9d..d2ba53c786d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaField.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaField.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeap.java index 86313fcf9bc..43ad02b492a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeapRegion.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeapRegion.java index f38e1eec019..9da634a467b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeapRegion.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaHeapRegion.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaInstanceField.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaInstanceField.java index 7c95bbab273..a9533814086 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaInstanceField.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaInstanceField.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaLocation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaLocation.java index 2696062588e..34bf329377b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaLocation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaLocation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMethod.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMethod.java index 316df83c248..5daa7c454e0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMethod.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMethod.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMonitor.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMonitor.java index 159652c2acf..e361ca8e95e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMonitor.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaObject.java index eea62141d89..c5dea764cbd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaReference.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaReference.java index f308b91ef2b..6d0055701f9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaReference.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaReference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaRuntime.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaRuntime.java index 8b6b3d883f3..2a084712ae3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaRuntime.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaRuntime.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStackFrame.java index cb005cfb0a6..293e000100c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStaticField.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStaticField.java index 5543a244cc2..ff5c574fc56 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStaticField.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaStaticField.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaThread.java index 76f1fff18b1..ec50685385a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMInitArgs.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMInitArgs.java index 60ddef77387..bb51d5bb0a0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMInitArgs.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMInitArgs.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMOption.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMOption.java index f1341dc6df0..2ff650c5c12 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMOption.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/JavaVMOption.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/TraceBuffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/TraceBuffer.java index 8850bebf29d..37530df083d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/TraceBuffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/j9/TraceBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCInvalidArgumentsException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCInvalidArgumentsException.java index 5ae516e54c9..f93afd4970c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCInvalidArgumentsException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCInvalidArgumentsException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClass.java index e20728b19fc..882dbeb525c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClassLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClassLoader.java index 919cc2004f9..bce973fdb24 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClassLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaLocation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaLocation.java index 935b2c60cfb..c8249e919f9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaLocation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaLocation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMethod.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMethod.java index 3d14d75f467..9fbd2f17b6d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMethod.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMethod.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMonitor.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMonitor.java index 8b1c42dfce9..1a4d560686d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMonitor.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaObject.java index 1d354f8608d..5671819762d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntime.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntime.java index 374ba359eef..671dd584798 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntime.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntime.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntimeMemoryCategory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntimeMemoryCategory.java index 7f8d77e69b3..ae1268776d7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntimeMemoryCategory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaRuntimeMemoryCategory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaStackFrame.java index f51e42e5c82..c170098df7d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaThread.java index ed1e3aac3a0..1af86dc4ff7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMInitArgs.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMInitArgs.java index d518febb4cc..667b39b3e66 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMInitArgs.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMInitArgs.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMOption.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMOption.java index 5241e9d623b..0357517056a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMOption.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/javacore/JCJavaVMOption.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.java.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/package-info.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/package-info.java index f6ad6116533..977f16c4e56 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/package-info.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/java/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/BuilderFailureException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/BuilderFailureException.java index 455e66d1fe1..d2d9964aa5f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/BuilderFailureException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/BuilderFailureException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IBuilderData.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IBuilderData.java index fc0fdea7c8b..e389035ae30 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IBuilderData.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IBuilderData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageAddressSpaceBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageAddressSpaceBuilder.java index a20d27ea485..6c5de2e4370 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageAddressSpaceBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageAddressSpaceBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilder.java index f431d64a514..9726fbbc4c1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilderFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilderFactory.java index be839632dba..8ed2792ed3a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilderFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageBuilderFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageProcessBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageProcessBuilder.java index 6a835cd2f30..c2bb48113b2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageProcessBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IImageProcessBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IJavaRuntimeBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IJavaRuntimeBuilder.java index 3e437d3e988..d9debb24d44 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IJavaRuntimeBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/IJavaRuntimeBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/AbstractBuilderComponent.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/AbstractBuilderComponent.java index f3038f5c90c..f32efea2016 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/AbstractBuilderComponent.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/AbstractBuilderComponent.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/BuilderContainer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/BuilderContainer.java index bb3b12c9078..449e87ec7b8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/BuilderContainer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/BuilderContainer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageAddressSpaceBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageAddressSpaceBuilder.java index d3033c0ccf3..01cf1dfb599 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageAddressSpaceBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageAddressSpaceBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilder.java index e7dd237d8b9..605438fa377 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilderFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilderFactory.java index 5d7d006b66f..de29b9bfc87 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilderFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageBuilderFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageProcessBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageProcessBuilder.java index 094f9edf71d..ae9755761e7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageProcessBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/ImageProcessBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/JavaRuntimeBuilder.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/JavaRuntimeBuilder.java index fa66cc3837b..f48142c9e5d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/JavaRuntimeBuilder.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/builder/javacore/JavaRuntimeBuilder.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.builder.javacore; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/MissingComponentException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/MissingComponentException.java index b2fdc5ab7ca..5ffc871d553 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/MissingComponentException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/MissingComponentException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/Section.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/Section.java index 3b972a5e1d8..5f826eb18fc 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/Section.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/Section.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/IInputBuffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/IInputBuffer.java index 967d014fd70..5c61b001fd0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/IInputBuffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/IInputBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.input; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/JavaCoreFileReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/JavaCoreFileReader.java index f9fdc3fcd9d..4b378733fdd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/JavaCoreFileReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/JavaCoreFileReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.input; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/LineJavaCoreInputBuffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/LineJavaCoreInputBuffer.java index ba119d67187..258a848ad7d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/LineJavaCoreInputBuffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/LineJavaCoreInputBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.input; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/OffsetBasedJavaCoreInputBuffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/OffsetBasedJavaCoreInputBuffer.java index 63ea90411f6..61f87e2534d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/OffsetBasedJavaCoreInputBuffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/input/OffsetBasedJavaCoreInputBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.input; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IErrorListener.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IErrorListener.java index 9a461611aac..32702033b16 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IErrorListener.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IErrorListener.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ILookAheadBuffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ILookAheadBuffer.java index 7693082bbf1..ab5477f02a0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ILookAheadBuffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ILookAheadBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IParserController.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IParserController.java index b8e225bd89a..ba2565bb37b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IParserController.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/IParserController.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ISectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ISectionParser.java index 42dcbc42cbf..18010b6324f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ISectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ISectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ParserException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ParserException.java index 3a511cdae60..52e04638f07 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ParserException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/parser/ParserException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IGeneralTokenTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IGeneralTokenTypes.java index 2eb4b253f91..4a88ec860d3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IGeneralTokenTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IGeneralTokenTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IParserToken.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IParserToken.java index a728cec0a6c..7618e960b27 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IParserToken.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IParserToken.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScanner.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScanner.java index d874cd3aa1d..81f59b067cb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScanner.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScanner.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScannerManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScannerManager.java index bde79284568..504c12f6a54 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScannerManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/IScannerManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/JavaCoreScanner.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/JavaCoreScanner.java index e659c5a65ab..f55a9e59a01 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/JavaCoreScanner.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/JavaCoreScanner.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/LookAheadBuffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/LookAheadBuffer.java index f6771f1b8c4..32eab1dce53 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/LookAheadBuffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/LookAheadBuffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ParserToken.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ParserToken.java index 88753744cad..a552c556a9e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ParserToken.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ParserToken.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerException.java index 0762c2ed873..a20ba8f78be 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerManager.java index fb4a39db847..dbc1449c8d0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/ScannerManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/TokenManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/TokenManager.java index 1171af7c45b..67664c1c341 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/TokenManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/scanner/TokenManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.scanner; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ILineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ILineRule.java index bd738813062..e0634308895 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ILineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ILineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagAttributeResult.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagAttributeResult.java index d948ca98159..6a06c018bdd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagAttributeResult.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagAttributeResult.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagManager.java index ee54d5b2193..ce353c8e727 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagParser.java index 0310389795a..c0b23a67626 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/ITagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/LineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/LineRule.java index 7cda248b8d6..35d06ed6ea9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/LineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/LineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/MissingPatternListException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/MissingPatternListException.java index 5385adc3042..a45eb4d2355 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/MissingPatternListException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/MissingPatternListException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagAttributeResult.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagAttributeResult.java index 6bf4de1f71c..9bdb03edf18 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagAttributeResult.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagAttributeResult.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagParser.java index 2d7292d1113..f6ab8016fd5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/framework/tag/TagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.framework.tag; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/AttributeValueMapFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/AttributeValueMapFactory.java index a398400c506..18ae944f4e5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/AttributeValueMapFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/AttributeValueMapFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/DTFJComponentLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/DTFJComponentLoader.java index 8c3ed013962..975ed4faa09 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/DTFJComponentLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/DTFJComponentLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/IAttributeValueMap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/IAttributeValueMap.java index f82fe5f0a6a..0147fb6b3b6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/IAttributeValueMap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/IAttributeValueMap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ITagSubSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ITagSubSection.java index 792d366308e..6acf286b4dc 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ITagSubSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ITagSubSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/J9TagManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/J9TagManager.java index 67195df3209..ba56a8d5e72 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/J9TagManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/J9TagManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreAttributeValueMap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreAttributeValueMap.java index 7deadd804ce..852ea378dd5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreAttributeValueMap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreAttributeValueMap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreReader.java index baaa1c4368b..351cb9053da 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreResourceReleaser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreResourceReleaser.java index 78951606265..88423bcc137 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreResourceReleaser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/JavaCoreResourceReleaser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ParserController.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ParserController.java index 6b7808d0806..4c7cbd5aeb4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ParserController.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/ParserController.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParser.java index 570a4dc73a8..48d318fc6cd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParserGrammar.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParserGrammar.java index 008864d759f..76c02982c53 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParserGrammar.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SectionParserGrammar.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignParserPartManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignParserPartManager.java index 243db7d42f3..2e71c0c343c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignParserPartManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignParserPartManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignSectionParserPart.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignSectionParserPart.java index 4c1f7ef8228..9f88f2bf875 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignSectionParserPart.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/SovereignSectionParserPart.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredComponents.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredComponents.java index 0b62ada9b2b..c5a081b07ea 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredComponents.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredComponents.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.registered; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredSections.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredSections.java index bf53e493043..005621e5790 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredSections.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/registered/RegisteredSections.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.registered; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderLineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderLineRule.java index b7645ce184c..83821db7d37 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderLineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderLineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.classloader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderPatternMatchers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderPatternMatchers.java index 752cacc5489..2daf8036cb0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderPatternMatchers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderPatternMatchers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.classloader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderSectionParser.java index ee7aa3bc068..23b2ac82f54 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.classloader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderTagParser.java index cddc561b58b..4feeb4cf887 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/ClassLoaderTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.classloader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/IClassLoaderTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/IClassLoaderTypes.java index cac85b7bc85..c84e1bed045 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/IClassLoaderTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/classloader/IClassLoaderTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.classloader; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonPatternMatchers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonPatternMatchers.java index 8fdaafda7a5..0954ac5b106 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonPatternMatchers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonPatternMatchers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.common; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonTagParser.java index a7c9d3c56a2..f4722256622 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/CommonTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.common; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/ICommonTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/ICommonTypes.java index 0dce5e6d539..c4b7f61340f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/ICommonTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/ICommonTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.common; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/PointerSizeLineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/PointerSizeLineRule.java index 0cf61483b3a..b4e7c846675 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/PointerSizeLineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/common/PointerSizeLineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.common; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentSectionParser.java index cec21dbf55f..c9473434a76 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.environment; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentTagParser.java index c46753e144a..1d4591e03b2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/EnvironmentTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.environment; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/IEnvironmentTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/IEnvironmentTypes.java index 1a4ffd7d121..f52411f72ca 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/IEnvironmentTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/environment/IEnvironmentTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.environment; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/IMemoryTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/IMemoryTypes.java index 1a7a48be4d5..3d3a8d24903 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/IMemoryTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/IMemoryTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.memory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemorySectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemorySectionParser.java index 697a6d65986..71a6e389e18 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemorySectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemorySectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.memory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemoryTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemoryTagParser.java index 294c08e062f..abb755a5449 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemoryTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/memory/MemoryTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.memory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypes.java index 0b06c383cc5..665d7491ab3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypesSov.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypesSov.java index fcc513133a7..ea66910ba3a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypesSov.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/IMonitorTypesSov.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorObjectLineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorObjectLineRule.java index b1b86e7d7c3..32edc55d363 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorObjectLineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorObjectLineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorPatternMatchers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorPatternMatchers.java index f0258fd7b7a..abe79e32834 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorPatternMatchers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorPatternMatchers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSectionParser.java index 44678363368..d9fc05fc02c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSovSectionParserPart.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSovSectionParserPart.java index af8837d67a8..9c8a279785f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSovSectionParserPart.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorSovSectionParserPart.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorTagParser.java index b91f277ce12..0c3c7eaaaa4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/monitor/MonitorTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.monitor; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/INativeMemoryTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/INativeMemoryTypes.java index 1c508710eec..d4398e248aa 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/INativeMemoryTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/INativeMemoryTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.nativememory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryPatternMatchers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryPatternMatchers.java index 360846db5ae..c6aaefe1dfa 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryPatternMatchers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryPatternMatchers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.nativememory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemorySectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemorySectionParser.java index 8c02309019f..3b6e75b6721 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemorySectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemorySectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.nativememory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryTagParser.java index e6b3f62ad17..fef3299da58 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/nativememory/NativeMemoryTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.nativememory; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/IPlatformTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/IPlatformTypes.java index 42ed53cc7e1..6e62dc4a5a1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/IPlatformTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/IPlatformTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.platform; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformPatternMatchers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformPatternMatchers.java index b91a85d2403..c6284496685 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformPatternMatchers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformPatternMatchers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.platform; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformSectionParser.java index e4f04dc841c..5d633e7fe83 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.platform; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformTagParser.java index ac325a7dcda..24e0718e6d7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/platform/PlatformTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.platform; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/IStackTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/IStackTypes.java index 3d12a186390..bbce945db86 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/IStackTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/IStackTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.stack; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackSectionParser.java index 226c2608385..27aeefc1b0b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.stack; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackTagParser.java index 92a7c1bdc01..f1300ceef3c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/stack/StackTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.stack; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypes.java index 3de19000648..e609815f978 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypesSov.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypesSov.java index 40bb2cbe8c2..6335db6a627 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypesSov.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/IThreadTypesSov.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/NativeStackTraceLineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/NativeStackTraceLineRule.java index 92647bcdf9e..54f75b3598f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/NativeStackTraceLineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/NativeStackTraceLineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/StackTraceLineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/StackTraceLineRule.java index 6f99bae2f3b..d1c2eb62361 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/StackTraceLineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/StackTraceLineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadInfoLineRule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadInfoLineRule.java index 123b62efb22..22df2ea0baa 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadInfoLineRule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadInfoLineRule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadPatternMatchers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadPatternMatchers.java index b3017e77128..a34296f1d8a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadPatternMatchers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadPatternMatchers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSectionParser.java index c00338c78a5..e7deb46cbfe 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSovSectionParserPart.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSovSectionParserPart.java index ba5711d4bbc..2e795c80a24 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSovSectionParserPart.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadSovSectionParserPart.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadTagParser.java index 2ac659803a0..9c2dcef67b1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/thread/ThreadTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.thread; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/ITitleTypes.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/ITitleTypes.java index c80563b5eae..46f07e76581 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/ITitleTypes.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/ITitleTypes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.title; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleSectionParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleSectionParser.java index a5bec8f67d3..022f1824ef8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleSectionParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleSectionParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.title; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleTagParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleTagParser.java index 5415864800c..1968df750f3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleTagParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/javacore/parser/j9/section/title/TitleTagParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.javacore.parser.j9.section.title; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptData.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptData.java index b2e6979a40b..4a5ed52d4c8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptData.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageModule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageModule.java index 024faa4dcc2..0344a341a2c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageModule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageModule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageSection.java index 4131e32cdc3..7997bf9a256 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageStackFrame.java index 484de562185..1ea1dfc0adf 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageThread.java index 5397c176528..921869993e8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptImageThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaClass.java index cc65bcf0037..0bc57a2ff8f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaLocation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaLocation.java index f551058e322..8a0cbc8a738 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaLocation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaLocation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaMonitor.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaMonitor.java index cc89ccffbe7..721f7adfc13 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaMonitor.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaObject.java index 0247c33b7ca..10639dbc960 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaStackFrame.java index 7302863a900..c307f6c28e7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaThread.java index 2dd86d757c6..a99837c8e4d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDCorruptJavaThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImage.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImage.java index 2525caf8679..bb2bc4377e8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImage.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageAddressSpace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageAddressSpace.java index 81f3f1af433..ec64a35a3c4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageAddressSpace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageAddressSpace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageFactory.java index a4e08b2d989..7204ab96243 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageModule.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageModule.java index f0163b5898b..575b087c4d1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageModule.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageModule.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImagePointer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImagePointer.java index 8797584ab92..bc444648923 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImagePointer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImagePointer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageProcess.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageProcess.java index 9d6ac6ce48c..4906a4faaf8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageProcess.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageProcess.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageSection.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageSection.java index fa8727e7dbe..e77b56d13a9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageSection.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageStackFrame.java index 47acccdd793..b8afa39621a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageThread.java index 75eceb26f6c..5bf40065916 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDImageThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClass.java index c395bb2ced1..372e204fd5d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClassLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClassLoader.java index 07167c32fae..8c0bfcd1bd4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClassLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaHeap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaHeap.java index af9e31a45df..9024487f7b6 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaHeap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaHeap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaLocation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaLocation.java index 55b30ac2c03..85f54875d46 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaLocation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaLocation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMethod.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMethod.java index 97073d60c5c..982256ab5ad 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMethod.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMethod.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMonitor.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMonitor.java index 679477e9f67..a8e58c214a8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMonitor.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaObject.java index 3548551fe52..d155aea0f36 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaReference.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaReference.java index d4e313281e6..2f5b0b540ea 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaReference.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaReference.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaRuntime.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaRuntime.java index dbc60c4c8bf..fd9f9e22969 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaRuntime.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaRuntime.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaStackFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaStackFrame.java index fea1da4c688..dfc67f0b50a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaStackFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaStackFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaThread.java index edf8214e03c..a87f9ac52a3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/PHDJavaThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/Base.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/Base.java index b4bb07da100..adfb94961c0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/Base.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/Base.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpReader.java index e9debb7babc..fe4f9d0f029 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpWriter.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpWriter.java index 885384abf95..bca1bf6e383 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpWriter.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/HeapdumpWriter.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PortableHeapDumpListener.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PortableHeapDumpListener.java index 1838fea8c85..5bc1415621c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PortableHeapDumpListener.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PortableHeapDumpListener.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PrintHeapdump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PrintHeapdump.java index b0eeb3a7011..203b54a0291 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PrintHeapdump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/parser/PrintHeapdump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.parser; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BitStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BitStream.java index 7cca3e36ccb..0b30d1b1e67 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BitStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BitStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BufferedNumberStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BufferedNumberStream.java index 0de5a15b6b8..14db0b869bf 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BufferedNumberStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/BufferedNumberStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongArray.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongArray.java index 6fa931f05ee..2b1fee9b953 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongArray.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongArray.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongEnumeration.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongEnumeration.java index d613548f6d7..02d5d35f538 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongEnumeration.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/LongEnumeration.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/NumberStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/NumberStream.java index ac97e0ca050..a405c29d117 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/NumberStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/NumberStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/PrimitiveArray.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/PrimitiveArray.java index af08fe7c55a..b925af726c2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/PrimitiveArray.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/PrimitiveArray.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortListener.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortListener.java index e183f2b7af7..cef9bd02bbe 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortListener.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortListener.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortedNumberStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortedNumberStream.java index 8eba6addb07..a806b7fd7d1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortedNumberStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/phd/util/SortedNumberStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.phd.util; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/ManagedRuntime.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/ManagedRuntime.java index 38c5c749a79..cb137cc25a5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/ManagedRuntime.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/ManagedRuntime.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.runtime; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/package-info.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/package-info.java index 134a1883749..292cff97616 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/package-info.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/runtime/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/ManagedImage.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/ManagedImage.java index 26c415bfd21..2c48bd9b3b0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/ManagedImage.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/ManagedImage.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/CompressedFileManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/CompressedFileManager.java index 0763bcb23ed..82a26d2e2c5 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/CompressedFileManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/CompressedFileManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileManager.java index efcb44d4b81..ef22ef8705c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileSniffer.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileSniffer.java index 1bd1c51f271..d7a5b1810fb 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileSniffer.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/FileSniffer.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/GZipFileManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/GZipFileManager.java index fd477df5300..9da7c9cb49b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/GZipFileManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/GZipFileManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ImageSourceType.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ImageSourceType.java index 5404cfd51a3..0d5842ad32d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ImageSourceType.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ImageSourceType.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/J9FileImageInputStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/J9FileImageInputStream.java index 1566513d260..a32bbc5559c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/J9FileImageInputStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/J9FileImageInputStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MVSImageInputStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MVSImageInputStream.java index fa9591c5e2b..0ab29f825a4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MVSImageInputStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MVSImageInputStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ManagedImageSource.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ManagedImageSource.java index ab6410e57e5..fddebf1471d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ManagedImageSource.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ManagedImageSource.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MultipleCandidateException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MultipleCandidateException.java index 0febea3ea07..56f9b973959 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MultipleCandidateException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/MultipleCandidateException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/SimpleFileManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/SimpleFileManager.java index b15a2c6b835..e3d505574e4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/SimpleFileManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/SimpleFileManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/UnzipFailedException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/UnzipFailedException.java index 8195674180f..1c7e45ea5d7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/UnzipFailedException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/UnzipFailedException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipFileManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipFileManager.java index 6f2786112fc..d59d8e3f283 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipFileManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipFileManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipMemoryCacheImageInputStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipMemoryCacheImageInputStream.java index f7d49c6d8e0..2e007c55e60 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipMemoryCacheImageInputStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/dtfj/utils/file/ZipMemoryCacheImageInputStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dtfj.utils.file; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/j9ddr/tools/ddrinteractive/Unused.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/j9ddr/tools/ddrinteractive/Unused.java index ef0336bf379..bb9f0ef2f6e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/j9ddr/tools/ddrinteractive/Unused.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/j9ddr/tools/ddrinteractive/Unused.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9ddr.tools.ddrinteractive; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/Context.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/Context.java index 8113ff45c23..a4bce60de06 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/Context.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/Context.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/ContextFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/ContextFactory.java index 48a8ec6aefb..6d653a48f22 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/ContextFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/ContextFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJContext.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJContext.java index fd02e7fe148..476f8fcfda1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJContext.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJImageBean.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJImageBean.java index 722f9056511..463bba3d2e2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJImageBean.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/DTFJImageBean.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/EmptyDTFJContext.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/EmptyDTFJContext.java index a8e466eee10..57c86fba440 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/EmptyDTFJContext.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/EmptyDTFJContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IContext.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IContext.java index 5259e5a8490..856680e1ebc 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IContext.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IDTFJContext.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IDTFJContext.java index cbeb30a7de4..4bb0d332d7f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IDTFJContext.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/IDTFJContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/BaseCommand.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/BaseCommand.java index fb4c33086ab..aaea6d6b18a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/BaseCommand.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/BaseCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandDescription.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandDescription.java index 4be6d1fd274..c404706034c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandDescription.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandDescription.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandException.java index cee12eefc87..5879cec7ae1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandParser.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandParser.java index 575202c400e..faa41a23553 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandParser.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/CommandParser.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/ICommand.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/ICommand.java index 8deb2564d5a..52ad2a72bca 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/ICommand.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/ICommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/PluginCommand.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/PluginCommand.java index 7e638800c4a..a370c112a2c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/PluginCommand.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/PluginCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/QuitCommand.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/QuitCommand.java index e9a0db0be3e..1bdeeaad077 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/QuitCommand.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/commands/QuitCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.commands; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Annotation.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Annotation.java index 0240f9672b9..ceb85b61a2a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Annotation.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Annotation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassInfo.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassInfo.java index 4403e04c1e6..cc69146133e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassInfo.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassListener.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassListener.java index 0a161852a83..4a20cbd63cd 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassListener.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/ClassListener.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Container.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Container.java index cb5b8bfa157..5d320fb49d9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Container.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Container.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJClassListener.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJClassListener.java index 86df180ae68..34ad05424d3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJClassListener.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJClassListener.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPlugin.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPlugin.java index b469a76755f..4b61058c262 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPlugin.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPlugin.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginConfig.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginConfig.java index a91f61c54cd..18384539af3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginConfig.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginConfig.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginManager.java index 543cdc6353a..7b1241634cf 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/DTFJPluginManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Entry.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Entry.java index 6328c4800ac..ca49d9cf43f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Entry.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/Entry.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/LocalPriorityClassloader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/LocalPriorityClassloader.java index b1cc4f10129..d5b0356cf62 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/LocalPriorityClassloader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/LocalPriorityClassloader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PackageFilteredClassloader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PackageFilteredClassloader.java index b1fa80377f4..d03b0dcea46 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PackageFilteredClassloader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PackageFilteredClassloader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConfig.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConfig.java index 4bac99a2733..ddc24d961cc 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConfig.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConfig.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConstants.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConstants.java index ec4aac614cd..bdbf32faa46 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConstants.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginConstants.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginListenerFactory.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginListenerFactory.java index 96aeaacc734..646d281b21f 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginListenerFactory.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginListenerFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginLoader.java index d1c4505082b..2c89b774572 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManager.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManager.java index 2df7599534b..19ca3df50c3 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManager.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManagerLocator.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManagerLocator.java index 2e26c259dd2..b92f4ebd103 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManagerLocator.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/PluginManagerLocator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/ClassScanner.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/ClassScanner.java index 89fd6ea1518..651e8492d85 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/ClassScanner.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/ClassScanner.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins.impl; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/PluginManagerImpl.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/PluginManagerImpl.java index d1ee69b7061..0c3a062b8c4 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/PluginManagerImpl.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/PluginManagerImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.java.diagnostics.utils.plugins.impl; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/JExtractFatalException.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/JExtractFatalException.java index de2ad11c60e..7d31301cc8d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/JExtractFatalException.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/JExtractFatalException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.extract; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/Main.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/Main.java index 29dd79bb028..63d44ebc453 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/Main.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/extract/Main.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.extract; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/IParserNode.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/IParserNode.java index 45ca6fa6fa2..2ba6db5dd14 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/IParserNode.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/IParserNode.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeAbstract.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeAbstract.java index 1378d74caa3..b2ebad49d5a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeAbstract.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeAbstract.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeArrayClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeArrayClass.java index cd43b5c14de..db1876d841c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeArrayClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeArrayClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeBuffers.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeBuffers.java index 48cbc1aff7d..40911470986 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeBuffers.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeBuffers.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeByteCode.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeByteCode.java index 6a02e5cc66b..40d7616b9ae 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeByteCode.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeByteCode.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInClassLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInClassLoader.java index 97aed7181f1..3f4e959fef2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInClassLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInConstantPool.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInConstantPool.java index 5f5e1475017..8453a21e38d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInConstantPool.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInConstantPool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInVM.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInVM.java index ac2a4e23cb6..3a0fbe8e998 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInVM.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassInVM.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassLoader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassLoader.java index f54e958587e..6ddd751056b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassLoader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeClassLoader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeConstantPool.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeConstantPool.java index d103be8fc49..d9d541ba0a1 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeConstantPool.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeConstantPool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeError.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeError.java index 0fb91450e56..fec65b517c7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeError.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeError.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeField.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeField.java index 580d10c3389..0a4e71aff0e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeField.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeField.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeFrame.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeFrame.java index b3be208e662..8a142912fc0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeFrame.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeFrame.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeGPF.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeGPF.java index f52dc630766..9e59d8df1b0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeGPF.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeGPF.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeader.java index 2076b06e489..e2a775b345e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeap.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeap.java index 2c65817fcb8..3d07b25f644 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeap.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeHeap.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeIP.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeIP.java index 399c81b91aa..f6070cfa5b7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeIP.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeIP.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeInterface.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeInterface.java index 5b5121a6502..e6e4e55945e 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeInterface.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeInterface.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJ9Dump.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJ9Dump.java index c1320c1281e..15ed27d4c3d 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJ9Dump.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJ9Dump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJIT.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJIT.java index 2ab6ca53408..e63cdca6b9c 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJIT.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJIT.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVM.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVM.java index eb326232a99..a80352f3064 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVM.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVM.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMInitArgs.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMInitArgs.java index 80cf53682d7..78292e32ee0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMInitArgs.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMInitArgs.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMOption.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMOption.java index b67a2c1415a..83003ce8a74 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMOption.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeJavaVMOption.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeLibrary.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeLibrary.java index e04c738a571..5a130b10d39 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeLibrary.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeLibrary.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMethod.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMethod.java index 3c86f37f349..f3d9236780b 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMethod.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMethod.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMonitor.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMonitor.java index 890ae4e8229..4aa8f0e24ab 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMonitor.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeMonitor.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeNet.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeNet.java index a88f86bafc3..a2660cf1145 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeNet.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeNet.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObject.java index 3a1a18478a4..5118f0458be 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObjects.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObjects.java index a061c137d72..886b4dfb416 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObjects.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeObjects.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeProperty.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeProperty.java index 1cc9f9e4092..aa12a4f4f27 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeProperty.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeProperty.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRegion.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRegion.java index d6e30c4ff32..c1342ac4120 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRegion.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRegion.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRoot.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRoot.java index 269cf6e6760..87b61cd48c9 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRoot.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRoot.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootClass.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootClass.java index d26fa209048..b2d6c9f8585 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootClass.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootObject.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootObject.java index cd526276d3c..51ad1d703ce 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootObject.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeRootObject.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStack.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStack.java index 9805470c02f..c371efcc7e8 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStack.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStack.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStatic.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStatic.java index 5b96c508f74..ab6fb333a10 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStatic.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeStatic.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeSystemProperties.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeSystemProperties.java index b8d5498694d..b4a712ee578 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeSystemProperties.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeSystemProperties.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeTrace.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeTrace.java index fd71fb153a1..7f40dfa7c5a 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeTrace.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeTrace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeUnexpectedTag.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeUnexpectedTag.java index 0abf11c41bf..de4fbcc37ca 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeUnexpectedTag.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeUnexpectedTag.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeVMThread.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeVMThread.java index 96b466e6766..ff5afb034d0 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeVMThread.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/NodeVMThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLIndexReader.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLIndexReader.java index 6c62c0333a9..e4fb3bd81f2 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLIndexReader.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLIndexReader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLInputStream.java b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLInputStream.java index 080ec033707..7babb4bbed7 100644 --- a/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLInputStream.java +++ b/jcl/src/openj9.dtfj/share/classes/com/ibm/jvm/j9/dump/indexsupport/XMLInputStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.j9.dump.indexsupport; diff --git a/jcl/src/openj9.dtfj/share/classes/dtfj-overview.html b/jcl/src/openj9.dtfj/share/classes/dtfj-overview.html index 1577f58c4dd..07c6e61e8b5 100644 --- a/jcl/src/openj9.dtfj/share/classes/dtfj-overview.html +++ b/jcl/src/openj9.dtfj/share/classes/dtfj-overview.html @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/jcl/src/openj9.dtfj/share/classes/module-info.java b/jcl/src/openj9.dtfj/share/classes/module-info.java index a9220200097..250d3016203 100644 --- a/jcl/src/openj9.dtfj/share/classes/module-info.java +++ b/jcl/src/openj9.dtfj/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/CombinedContext.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/CombinedContext.java index 242fd582368..5fc9a8867ab 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/CombinedContext.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/CombinedContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ConsoleOutputChannel.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ConsoleOutputChannel.java index 6bfb48d8b6e..02867281028 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ConsoleOutputChannel.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ConsoleOutputChannel.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/DTFJView.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/DTFJView.java index e77462b8db9..56057fb75b8 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/DTFJView.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/DTFJView.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ExitCodes.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ExitCodes.java index d4bab2cc07f..ecc361ec1c0 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ExitCodes.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/ExitCodes.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/FileOutputChannel.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/FileOutputChannel.java index ddf24b00746..0f0f0849f09 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/FileOutputChannel.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/FileOutputChannel.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewContextManager.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewContextManager.java index ca2f39c7b88..05d26ef239e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewContextManager.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewContextManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewInitException.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewInitException.java index db64195f3ec..78f0961ff6a 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewInitException.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewInitException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewPrintStream.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewPrintStream.java index 7a8b4aec38a..16661b0f5dc 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewPrintStream.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/JdmpviewPrintStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Output.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Output.java index 9623f57fb13..31f9d5911ff 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Output.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Output.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/OutputChannelRedirector.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/OutputChannelRedirector.java index c4122c5361f..5a0fb2ad0fc 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/OutputChannelRedirector.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/OutputChannelRedirector.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Session.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Session.java index 3f4abe3140c..93c981e9eaa 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Session.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Session.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SessionProperties.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SessionProperties.java index f90aee3f981..7fc7c3d8be7 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SessionProperties.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SessionProperties.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SystemProperties.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SystemProperties.java index 3dc24ce9d0a..51f56d9a611 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SystemProperties.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/SystemProperties.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Version.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Version.java index b6afe632ec9..1dd1930331e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Version.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/Version.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/BaseJdmpviewCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/BaseJdmpviewCommand.java index 9e2a73e3778..596b2c04a7d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/BaseJdmpviewCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/BaseJdmpviewCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CdCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CdCommand.java index cd5f3d82b60..475449c609e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CdCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CdCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CloseCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CloseCommand.java index dfc7b99b678..42480e54fec 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CloseCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/CloseCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/DeadlockCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/DeadlockCommand.java index c94c5eb8b72..e0bd7cf7e9f 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/DeadlockCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/DeadlockCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ExceptionHandler.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ExceptionHandler.java index 053baec183d..519f4c8e1bc 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ExceptionHandler.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ExceptionHandler.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindCommand.java index 45348e28097..f8d77b97257 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindNextCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindNextCommand.java index 34251c26343..00724e1fd33 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindNextCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindNextCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindPtrCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindPtrCommand.java index e3b1afc7674..f84fb94f120 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindPtrCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/FindPtrCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HeapdumpCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HeapdumpCommand.java index d04deefdaca..95b3a639991 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HeapdumpCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HeapdumpCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HelpCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HelpCommand.java index 4bcba022e40..08b88474c34 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HelpCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HelpCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HexdumpCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HexdumpCommand.java index 3701b893b30..bc89165f522 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HexdumpCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/HexdumpCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/LogCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/LogCommand.java index cade2a40652..9977adc94b4 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/LogCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/LogCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/OpenCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/OpenCommand.java index f99bc1a49d0..c4fb5565da2 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/OpenCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/OpenCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/PwdCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/PwdCommand.java index 8c81c89bf19..88263c12136 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/PwdCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/PwdCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ScrollCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ScrollCommand.java index b836f3cf707..2d26b9adb52 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ScrollCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/ScrollCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/SimpleRedirectorCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/SimpleRedirectorCommand.java index eabb39e754c..50073907f92 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/SimpleRedirectorCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/SimpleRedirectorCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/WhatisCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/WhatisCommand.java index 4e96b7dd040..1bbe8556f50 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/WhatisCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/WhatisCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ClassOutput.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ClassOutput.java index 78bcec54099..ab5ed6aa5a8 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ClassOutput.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ClassOutput.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Exceptions.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Exceptions.java index fd8eea60534..bb8344694f1 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Exceptions.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Exceptions.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/JUCMonitorNode.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/JUCMonitorNode.java index 15d2d8c7c16..63202d171e3 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/JUCMonitorNode.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/JUCMonitorNode.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorNode.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorNode.java index 285bf187763..31e063a1f4f 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorNode.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorNode.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorState.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorState.java index cc1381491d7..91fc0f5aefd 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorState.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/MonitorState.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/NodeList.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/NodeList.java index 1fde7da4b3e..dc5e4a43b99 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/NodeList.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/NodeList.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/StateToString.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/StateToString.java index 16e5f4b333a..9c7aba5b6d3 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/StateToString.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/StateToString.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ThreadData.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ThreadData.java index 2ad289bbb4a..a5f13066dc9 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ThreadData.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/ThreadData.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Utils.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Utils.java index 0d4424cbadd..138ef5e1f2d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Utils.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/helpers/Utils.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.helpers; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoClassCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoClassCommand.java index bf7a31f9ea4..b804d1ae4d5 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoClassCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoClassCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoCommand.java index cccdeafe80c..eaeb5d24fad 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoHeapCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoHeapCommand.java index 0a73381a3c4..f5fff84b0f2 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoHeapCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoHeapCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoJitmCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoJitmCommand.java index 6c820ca730e..8049c311913 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoJitmCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoJitmCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoLockCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoLockCommand.java index 8faaa4171ce..96292907d68 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoLockCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoLockCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMemoryCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMemoryCommand.java index ac4dbe9e3ad..cc614a2206c 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMemoryCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMemoryCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMmapCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMmapCommand.java index 0d387ebd687..1014c85b45e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMmapCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoMmapCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoProcCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoProcCommand.java index a671bf644d6..3c2d1b6986c 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoProcCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoProcCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSymCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSymCommand.java index e8515580c68..0a39e758042 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSymCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSymCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSystemCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSystemCommand.java index 0dd692992b8..5859b0f80c6 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSystemCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoSystemCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoThreadCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoThreadCommand.java index e6354650a28..128814d1c40 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoThreadCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/infocommands/InfoThreadCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.infocommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetCommand.java index c8d7c0677f5..ee6413f5e17 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.setcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetHeapdumpCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetHeapdumpCommand.java index 81e86bf2661..14c71d9f9bf 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetHeapdumpCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetHeapdumpCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.setcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetLoggingCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetLoggingCommand.java index 97131067eea..3fe13a4df63 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetLoggingCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/setcommands/SetLoggingCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.setcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowCommand.java index d3e15296d5e..d8fd1eb3dae 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.showcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowHeapdumpCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowHeapdumpCommand.java index 1d5d0469d4c..b44716df964 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowHeapdumpCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowHeapdumpCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.showcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowLoggingCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowLoggingCommand.java index 20abead1cac..3ba73d3bfd9 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowLoggingCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/showcommands/ShowLoggingCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.showcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XCommand.java index b0fc3b92802..95bcde23403 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.xcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XDCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XDCommand.java index 964ddd53a9d..6ac3e50da5f 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XDCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XDCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.xcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XJCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XJCommand.java index 22493ae3597..6abb6f7732a 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XJCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XJCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.xcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XKCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XKCommand.java index 7adb1d2c272..a2a285b8b8f 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XKCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XKCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.xcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XXCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XXCommand.java index 63d84424648..cd3f980d349 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XXCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/commands/xcommands/XXCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.commands.xcommands; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpFormatter.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpFormatter.java index e8e104f7843..853d8a7215d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpFormatter.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpFormatter.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpSettings.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpSettings.java index 838e1077177..63ac38e8d6c 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpSettings.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/HeapDumpSettings.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongArrayReferenceIterator.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongArrayReferenceIterator.java index dbdb4ce645d..09f83e18091 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongArrayReferenceIterator.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongArrayReferenceIterator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongListReferenceIterator.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongListReferenceIterator.java index 7e1cc22b41e..50a0b301073 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongListReferenceIterator.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/LongListReferenceIterator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/ReferenceIterator.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/ReferenceIterator.java index 43e0a74d354..328bcaddeac 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/ReferenceIterator.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/ReferenceIterator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/classic/ClassicHeapDumpFormatter.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/classic/ClassicHeapDumpFormatter.java index 90e69e908df..6e65af805a0 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/classic/ClassicHeapDumpFormatter.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/classic/ClassicHeapDumpFormatter.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.classic; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ClassRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ClassRecord.java index 8c337fee12a..d583cfae02e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ClassRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ClassRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongObjectRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongObjectRecord.java index ca50423b056..065354d3def 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongObjectRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongObjectRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongPrimitiveArrayRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongPrimitiveArrayRecord.java index b557ade4143..8bdd3002515 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongPrimitiveArrayRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/LongPrimitiveArrayRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/MediumObjectRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/MediumObjectRecord.java index 83f300b25a1..c3d19242f3a 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/MediumObjectRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/MediumObjectRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectArrayRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectArrayRecord.java index 02526daed94..373c9451b40 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectArrayRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectArrayRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectRecord.java index b932143943f..685ea64eb67 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ObjectRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpClassCache.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpClassCache.java index ba3517deda9..dbe4ea24a98 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpClassCache.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpClassCache.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpFormatter.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpFormatter.java index 2f1c9ae00a7..c3e8b529c38 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpFormatter.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpFormatter.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpHeader.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpHeader.java index e66f4470772..befc2d4679e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpHeader.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpHeader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpRecord.java index ee94ab04d0e..84fbb70bf3d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PortableHeapDumpRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PrimitiveArrayRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PrimitiveArrayRecord.java index 353a3fb1d2f..bf355aef491 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PrimitiveArrayRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/PrimitiveArrayRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ShortObjectRecord.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ShortObjectRecord.java index 583f5211f88..00336814222 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ShortObjectRecord.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/heapdump/portable/ShortObjectRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.heapdump.portable; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ICombinedContext.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ICombinedContext.java index d11077be9e8..ffe831c6e75 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ICombinedContext.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ICombinedContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.spi; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputChannel.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputChannel.java index 482bfd0dbc5..3c143632a4a 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputChannel.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputChannel.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.spi; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputManager.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputManager.java index 8e39f928ca5..cedfde621fa 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputManager.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/IOutputManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.spi; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISession.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISession.java index c920246ce85..17c5e989059 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISession.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISession.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.spi; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISessionContextManager.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISessionContextManager.java index 775066a16fa..1299cacd566 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISessionContextManager.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/spi/ISessionContextManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.spi; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/CommandException.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/CommandException.java index c41b9b55033..d224036a72c 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/CommandException.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/CommandException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/IPipe.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/IPipe.java index 981151f98b3..891becc4571 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/IPipe.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/IPipe.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ITool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ITool.java index 3781ee9accc..896aac2712d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ITool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ITool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ParsedCommand.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ParsedCommand.java index 5c228ba8414..ab728209598 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ParsedCommand.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ParsedCommand.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/Tool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/Tool.java index c5aae56423b..ec46b2bf6f6 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/Tool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/Tool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistry.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistry.java index ccacbecb543..a9dd14d0c6c 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistry.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistry.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistryOutputChannels.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistryOutputChannels.java index 1d119a1e696..1aeef95ffea 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistryOutputChannels.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/ToolsRegistryOutputChannels.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsFromTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsFromTool.java index 2e28d8593c7..ac1f6d8116d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsFromTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsFromTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsToTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsToTool.java index 143b0b36e73..f0aae2c93d6 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsToTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CharsToTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CmdFileTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CmdFileTool.java index 68c54a111bd..5e85f451847 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CmdFileTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/CmdFileTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/GrepTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/GrepTool.java index 0cf0ccbc239..9e90cf8a05d 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/GrepTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/GrepTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HelpTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HelpTool.java index 86e3f2dff07..65b74f514db 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HelpTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HelpTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HistoryTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HistoryTool.java index 97dece212d8..276846cccbb 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HistoryTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/HistoryTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/OutFileTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/OutFileTool.java index 2b8dc777392..b724974ec33 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/OutFileTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/OutFileTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/TokensTool.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/TokensTool.java index aa7cb8ca1c7..2385c81bcc4 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/TokensTool.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/impl/TokensTool.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.impl; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPostmatchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPostmatchHandle.java index f16b2b24b53..e9adeb1a5d0 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPostmatchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPostmatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPrematchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPrematchHandle.java index 81b16f058e7..acfc72dad8e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPrematchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/BlockPrematchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/FileUtils.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/FileUtils.java index 7ff3a5d9cc8..2b0b9be5296 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/FileUtils.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/FileUtils.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IMatchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IMatchHandle.java index 4614b8a4838..122b5219b17 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IMatchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IMatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPostmatchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPostmatchHandle.java index 61205b1c6a2..4a4bcdac0ec 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPostmatchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPostmatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPrematchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPrematchHandle.java index 65e2ef393f7..b4a93c273c4 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPrematchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IPrematchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IStringModifier.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IStringModifier.java index 80e3fedba56..9d86c308adb 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IStringModifier.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/IStringModifier.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MatchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MatchHandle.java index b79fbd32beb..c461c6e2a7f 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MatchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPostmatchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPostmatchHandle.java index c371c240751..d35bc981d20 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPostmatchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPostmatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPrematchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPrematchHandle.java index 383e0a328ef..8e8f80a7201 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPrematchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/MaxLinesPrematchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/OutputStreamModifier.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/OutputStreamModifier.java index 0cba11bd510..419a74b585e 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/OutputStreamModifier.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/OutputStreamModifier.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/RegExprMatchHandle.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/RegExprMatchHandle.java index d603865567f..2b86e385953 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/RegExprMatchHandle.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/RegExprMatchHandle.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringModifier.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringModifier.java index 0afe07d3ebb..7c8bde4f901 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringModifier.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringModifier.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringReceiver.java b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringReceiver.java index e0d41ff088b..cc733496d95 100644 --- a/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringReceiver.java +++ b/jcl/src/openj9.dtfjview/share/classes/com/ibm/jvm/dtfjview/tools/utils/StringReceiver.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.dtfjview.tools.utils; diff --git a/jcl/src/openj9.dtfjview/share/classes/module-info.java b/jcl/src/openj9.dtfjview/share/classes/module-info.java index 09b7f30cd77..ed125d77f62 100644 --- a/jcl/src/openj9.dtfjview/share/classes/module-info.java +++ b/jcl/src/openj9.dtfjview/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDADevice.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDADevice.java index 8ce3e3aea00..0feaa91c401 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDADevice.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDADevice.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDAManager.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDAManager.java index 2198770a87b..0d4947849ad 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDAManager.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/CUDAManager.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUConfigurationException.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUConfigurationException.java index e086b859405..7e6eb060589 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUConfigurationException.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUConfigurationException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUPermission.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUPermission.java index d5a86af6781..cdba425fac6 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUPermission.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUPermission.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUSortException.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUSortException.java index 6d2885f0236..9070d668017 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUSortException.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/GPUSortException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Maths.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Maths.java index a846ab8483c..986083f8690 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Maths.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Maths.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/PtxKernelGenerator.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/PtxKernelGenerator.java index d7446c8f390..1af370011b9 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/PtxKernelGenerator.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/PtxKernelGenerator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/SortNetwork.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/SortNetwork.java index 6bce46c15bb..16cd5ecc342 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/SortNetwork.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/SortNetwork.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Version.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Version.java index 8fbb80f5b3c..c6ec042ab16 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Version.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/Version.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/ibm_gpu_thresholds.properties b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/ibm_gpu_thresholds.properties index 2d1ffd53f79..9df3ae70edb 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/ibm_gpu_thresholds.properties +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/ibm_gpu_thresholds.properties @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # ======================================================================== com.ibm.gpu.DoubleSortThreshold.DEFAULT = 30000 diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssist.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssist.java index f9ac5dd2110..452646c4b83 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssist.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssist.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu.internal; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssistProvider.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssistProvider.java index b9d51590ca5..782e793a5fb 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssistProvider.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/internal/CudaGPUAssistProvider.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.gpu.internal; diff --git a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/package-info.java b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/package-info.java index 7266e089cd9..b992a5e0fbd 100644 --- a/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/package-info.java +++ b/jcl/src/openj9.gpu/share/classes/com/ibm/gpu/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.gpu/share/classes/module-info.java b/jcl/src/openj9.gpu/share/classes/module-info.java index cea61fa4462..4f42471572c 100644 --- a/jcl/src/openj9.gpu/share/classes/module-info.java +++ b/jcl/src/openj9.gpu/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Debuggable.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Debuggable.java index 13cbce970a5..676a7b6d98c 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Debuggable.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Debuggable.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.ElementType; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Dump.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Dump.java index 79975c1e625..d54674f16a8 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Dump.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Dump.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpConfigurationUnavailableException.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpConfigurationUnavailableException.java index b4d88fecbb5..8ac530f6118 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpConfigurationUnavailableException.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpConfigurationUnavailableException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpPermission.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpPermission.java index b3b1a03e817..6aa7eee14e3 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpPermission.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/DumpPermission.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.BasicPermission; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/InvalidDumpOptionException.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/InvalidDumpOptionException.java index bcb49cdf7a3..32adf540b3c 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/InvalidDumpOptionException.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/InvalidDumpOptionException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Log.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Log.java index 3c59a7575b7..57d9280f48f 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Log.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Log.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/LogPermission.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/LogPermission.java index 90c1c7425f7..841b2043f10 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/LogPermission.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/LogPermission.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.BasicPermission; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Stats.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Stats.java index c9f6db1f78a..859f2a6e857 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Stats.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Stats.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/ToolDumpPermission.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/ToolDumpPermission.java index b8e50c43e6c..f2c4f38bc3a 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/ToolDumpPermission.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/ToolDumpPermission.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.BasicPermission; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Trace.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Trace.java index bacbb401e11..014e379beda 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Trace.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/Trace.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/TracePermission.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/TracePermission.java index c9df09053f4..8065b6fd179 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/TracePermission.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/TracePermission.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.BasicPermission; diff --git a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/package-info.java b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/package-info.java index 6cd2a020716..0050e63d12b 100644 --- a/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/package-info.java +++ b/jcl/src/openj9.jvm/share/classes/com/ibm/jvm/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.jvm/share/classes/module-info.java b/jcl/src/openj9.jvm/share/classes/module-info.java index 403aa7f9a70..2629d219fa4 100644 --- a/jcl/src/openj9.jvm/share/classes/module-info.java +++ b/jcl/src/openj9.jvm/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/CannotSetClasspathException.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/CannotSetClasspathException.java index e00d08a299e..a7ef6089059 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/CannotSetClasspathException.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/CannotSetClasspathException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/HelperAlreadyDefinedException.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/HelperAlreadyDefinedException.java index 777e7810a2a..81560e08154 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/HelperAlreadyDefinedException.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/HelperAlreadyDefinedException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/Shared.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/Shared.java index b4f75db9abb..6104797886b 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/Shared.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/Shared.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelper.java index f79c12b6063..5da9a6cfe5c 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelperFactory.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelperFactory.java index 46d203ba471..3f7bb1532a8 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelperFactory.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedAbstractHelperFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassAbstractHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassAbstractHelper.java index a85a0ffd315..bbb167769a1 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassAbstractHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassAbstractHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassCacheInfo.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassCacheInfo.java index 64a1e2fd0dd..75145edddd3 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassCacheInfo.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassCacheInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassFilter.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassFilter.java index 738e21fff53..1dc842bd035 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassFilter.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassFilter.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelper.java index 0d16b2a2373..85f17609680 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactory.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactory.java index cebbc2f7733..4de57aeb5a9 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactory.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactoryImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactoryImpl.java index 64d57281d1a..4a84156b1d8 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactoryImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassHelperFactoryImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermission.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermission.java index 4a0ff4a9c5a..edb6faa6301 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermission.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermission.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermissionCollection.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermissionCollection.java index 056bad5db45..e4d930de5ed 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermissionCollection.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassPermissionCollection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassStatistics.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassStatistics.java index 08c500bf81e..c8f7afd8a6e 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassStatistics.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassStatistics.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelper.java index 166a728051f..19863443ee8 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelperImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelperImpl.java index 26e901cdfd6..aea3d50d07d 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelperImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassTokenHelperImpl.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelper.java index 23757059884..1ee167b9066 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelper.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelperImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelperImpl.java index 0ec23598389..21cf3a1dc25 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelperImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLClasspathHelperImpl.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelper.java index dad1e417584..e9eb85da6a5 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelper.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelperImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelperImpl.java index 1919bfbe3c0..0a43cdfc451 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelperImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassURLHelperImpl.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassUtilities.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassUtilities.java index 8fa8de76708..44cc5cdfdd5 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassUtilities.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassUtilities.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassesNamedPermission.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassesNamedPermission.java index 112a11d8ed1..58c49fd4f72 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassesNamedPermission.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedClassesNamedPermission.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.BasicPermission; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelper.java index c4fca254b17..f956e821272 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactory.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactory.java index 570f75b29e4..ebcd97c7848 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactory.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactory.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactoryImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactoryImpl.java index 9e238082c35..50f6644a18e 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactoryImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperFactoryImpl.java @@ -22,7 +22,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperImpl.java index 19c8c030559..bc1a3504165 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedDataHelperImpl.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.nio.ByteBuffer; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedHelper.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedHelper.java index f581a174759..25724373f6d 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedHelper.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/SharedHelper.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared; diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/package-info.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/package-info.java index 293a409c2bc..ebf35d15a9b 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/package-info.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/provider/SharedClassProviderImpl.java b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/provider/SharedClassProviderImpl.java index e3ae3e27255..21036f2e588 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/provider/SharedClassProviderImpl.java +++ b/jcl/src/openj9.sharedclasses/share/classes/com/ibm/oti/shared/provider/SharedClassProviderImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.shared.provider; diff --git a/jcl/src/openj9.sharedclasses/share/classes/module-info.java b/jcl/src/openj9.sharedclasses/share/classes/module-info.java index 64901aa33a5..729926b212a 100644 --- a/jcl/src/openj9.sharedclasses/share/classes/module-info.java +++ b/jcl/src/openj9.sharedclasses/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/TraceFormat.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/TraceFormat.java index ea4221584bc..9a178b55826 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/TraceFormat.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/TraceFormat.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[ENDIF]*/ /*[#INCLUDE traceformat/TraceFormat.java]*/ diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ActiveSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ActiveSection.java index 8435520ca8e..4c7eb58c245 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ActiveSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ActiveSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Format2Tprof.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Format2Tprof.java index d99868844f9..e3c11a469bb 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Format2Tprof.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Format2Tprof.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/IncompleteTracePoint.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/IncompleteTracePoint.java index 53cfafc0de7..d2624a4efb1 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/IncompleteTracePoint.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/IncompleteTracePoint.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/InvalidSpannedRecordException.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/InvalidSpannedRecordException.java index 8196d1bd22a..b4673520ab5 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/InvalidSpannedRecordException.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/InvalidSpannedRecordException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Merge.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Merge.java index 94a35be97f8..054ffadd147 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Merge.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Merge.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Message.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Message.java index 151ee37d6f3..545ef03340f 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Message.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Message.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/MessageFile.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/MessageFile.java index fad5f243148..70cbe2e7008 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/MessageFile.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/MessageFile.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ProcessorSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ProcessorSection.java index afb45403fd5..cd076f3405d 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ProcessorSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ProcessorSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ServiceSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ServiceSection.java index f5f41aa7adb..ef2b31e55e1 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ServiceSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/ServiceSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/StartupSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/StartupSection.java index 64e45d81e97..dbeef6182e5 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/StartupSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/StartupSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceArgs.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceArgs.java index 63b83d350df..773385e5453 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceArgs.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceArgs.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFile.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFile.java index c72d8d39df6..3ebb89c0c1f 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFile.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFile.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFileHeader.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFileHeader.java index 5f07b311004..4ecf2439065 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFileHeader.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFileHeader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFormat.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFormat.java index 7d64316e52e..7f5896ba048 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFormat.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceFormat.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TracePoint.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TracePoint.java index 3e227b74490..931cf4c63ea 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TracePoint.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TracePoint.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord.java index 33e0bc9f507..e0e9149182d 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord50.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord50.java index 17dd23b922f..5bb04f8818a 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord50.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecord50.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordExternal.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordExternal.java index 96174bdf57d..920c3cf7b2f 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordExternal.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordExternal.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordInternal.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordInternal.java index a8736ca2da8..a1204d3d915 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordInternal.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceRecordInternal.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceSection.java index 2d5ce3ee3ca..3993c791a53 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceThread.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceThread.java index 9b408684277..481201c080b 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceThread.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/TraceThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Util.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Util.java index 22fa6ac5dd2..b7802c2dd5c 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Util.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/format/Util.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.format; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFile.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFile.java index 81f6185e0ac..ac6bbcdfe24 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFile.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFile.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFileHeader.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFileHeader.java index 6e1ec5ab79c..219eec91e3c 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFileHeader.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceFileHeader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePoint.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePoint.java index d6dd2afd4db..cf1f94ddb46 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePoint.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePoint.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointGlobalChronologicalIterator.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointGlobalChronologicalIterator.java index 21e74254a07..4677792219e 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointGlobalChronologicalIterator.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointGlobalChronologicalIterator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointThreadChronologicalIterator.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointThreadChronologicalIterator.java index 660d477a1c2..2e6232b38d9 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointThreadChronologicalIterator.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TracePointThreadChronologicalIterator.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceThread.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceThread.java index 9262942ddf9..083f8d97b6e 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceThread.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/TraceThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ActiveSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ActiveSection.java index a76f64184f1..95dca90669d 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ActiveSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ActiveSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ByteStream.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ByteStream.java index 8f95a7a716f..14209881561 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ByteStream.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ByteStream.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Component.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Component.java index 5cc954f09a2..39a127f1021 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Component.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Component.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/DataHeader.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/DataHeader.java index e7e27c97854..045897c33cf 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/DataHeader.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/DataHeader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Message.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Message.java index 142b6b89888..dda13fb8473 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Message.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/Message.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MessageFile.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MessageFile.java index 66e36767d4f..5e557353540 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MessageFile.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MessageFile.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MissingDataException.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MissingDataException.java index b63baba6140..4423bf67855 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MissingDataException.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/MissingDataException.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ProcessorSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ProcessorSection.java index cc1c3550798..b066c62b106 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ProcessorSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ProcessorSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ServiceSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ServiceSection.java index dc7bf8a7b37..d50293a5633 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ServiceSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/ServiceSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/StartupSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/StartupSection.java index 900ddcb4667..712a315ead3 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/StartupSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/StartupSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceContext.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceContext.java index 7aeb8179666..cebe9654044 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceContext.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceContext.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceFileHeader.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceFileHeader.java index f26036f8c58..05fa1ec5143 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceFileHeader.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceFileHeader.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePoint.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePoint.java index 41cb157e9f8..cdf9e880042 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePoint.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePoint.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointDebugInfo.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointDebugInfo.java index a947ecea26b..1e2d027924d 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointDebugInfo.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointDebugInfo.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointImpl.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointImpl.java index 88f8fd7c702..1725fd61269 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointImpl.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TracePointImpl.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceRecord.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceRecord.java index ada695984d7..70323d5bf4c 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceRecord.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceRecord.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceSection.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceSection.java index 1e82d8ca800..5c09a4d2788 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceSection.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceSection.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceThread.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceThread.java index 7a2d46b76c6..7eb286840d6 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceThread.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/TraceThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.trace.format.api; diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/package-info.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/package-info.java index 5d54bc3a00c..24a1dbba983 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/package-info.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/trace/format/api/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * This API is used to process trace buffers generated by OpenJ9. These buffers are analogous to the diff --git a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/traceformat/TraceFormat.java b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/traceformat/TraceFormat.java index e11f066ca06..b0d29b0f7bd 100644 --- a/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/traceformat/TraceFormat.java +++ b/jcl/src/openj9.traceformat/share/classes/com/ibm/jvm/traceformat/TraceFormat.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*[IF Sidecar19-SE]*/ package com.ibm.jvm.traceformat; diff --git a/jcl/src/openj9.traceformat/share/classes/module-info.java b/jcl/src/openj9.traceformat/share/classes/module-info.java index 619f1634c01..cc59879dd07 100644 --- a/jcl/src/openj9.traceformat/share/classes/module-info.java +++ b/jcl/src/openj9.traceformat/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/ConditionException.java b/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/ConditionException.java index e410876751e..cb02ee2d165 100644 --- a/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/ConditionException.java +++ b/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/ConditionException.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.le.conditionhandling; diff --git a/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/package-info.java b/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/package-info.java index 94416458be6..f0992412e55 100644 --- a/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/package-info.java +++ b/jcl/src/openj9.zosconditionhandling/share/classes/com/ibm/le/conditionhandling/package-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/jcl/src/openj9.zosconditionhandling/share/classes/module-info.java b/jcl/src/openj9.zosconditionhandling/share/classes/module-info.java index 519bcbe5a0e..cbb34c1f0e3 100644 --- a/jcl/src/openj9.zosconditionhandling/share/classes/module-info.java +++ b/jcl/src/openj9.zosconditionhandling/share/classes/module-info.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/longabout.html b/longabout.html index 3609b4bff98..d1cb0878145 100644 --- a/longabout.html +++ b/longabout.html @@ -20,7 +20,7 @@

License

[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may @@ -47,7 +47,7 @@

Eclipse OMR

[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

Subject to the following notices:
1. Google Test is provided under the Google Test license below.
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 21aad5d86b3..586a892f6bb 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ ### diff --git a/runtime/GNUmakefile b/runtime/GNUmakefile index c3668be6536..3eb5831c369 100644 --- a/runtime/GNUmakefile +++ b/runtime/GNUmakefile @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This makefile should be invoked as the default makefile for building J9, diff --git a/runtime/bcutil/AllocationStrategy.hpp b/runtime/bcutil/AllocationStrategy.hpp index 9bce9313b44..218a99cd187 100644 --- a/runtime/bcutil/AllocationStrategy.hpp +++ b/runtime/bcutil/AllocationStrategy.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/BufferManager.cpp b/runtime/bcutil/BufferManager.cpp index 8f8518f0c33..3173d163bfb 100644 --- a/runtime/bcutil/BufferManager.cpp +++ b/runtime/bcutil/BufferManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * BufferManager.cpp diff --git a/runtime/bcutil/BufferManager.hpp b/runtime/bcutil/BufferManager.hpp index f16a10227ea..eb1bfa4bace 100644 --- a/runtime/bcutil/BufferManager.hpp +++ b/runtime/bcutil/BufferManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/BuildResult.hpp b/runtime/bcutil/BuildResult.hpp index 3fde3996933..551f9b3ce6b 100644 --- a/runtime/bcutil/BuildResult.hpp +++ b/runtime/bcutil/BuildResult.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/CMakeLists.txt b/runtime/bcutil/CMakeLists.txt index ea6403e9203..63beb1f9642 100644 --- a/runtime/bcutil/CMakeLists.txt +++ b/runtime/bcutil/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/bcutil/ClassFileOracle.cpp b/runtime/bcutil/ClassFileOracle.cpp index 0b8febf2f0e..de60b7b49a3 100644 --- a/runtime/bcutil/ClassFileOracle.cpp +++ b/runtime/bcutil/ClassFileOracle.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ClassFileOracle.cpp diff --git a/runtime/bcutil/ClassFileOracle.hpp b/runtime/bcutil/ClassFileOracle.hpp index 1b4bb160252..ec21ce54b41 100644 --- a/runtime/bcutil/ClassFileOracle.hpp +++ b/runtime/bcutil/ClassFileOracle.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ClassFileParser.cpp b/runtime/bcutil/ClassFileParser.cpp index 3e6dab2d5ae..df0b95d90f0 100644 --- a/runtime/bcutil/ClassFileParser.cpp +++ b/runtime/bcutil/ClassFileParser.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ClassFileParser.hpp" #include "ROMClassCreationContext.hpp" diff --git a/runtime/bcutil/ClassFileParser.hpp b/runtime/bcutil/ClassFileParser.hpp index 8498db77352..db5e69adbc0 100644 --- a/runtime/bcutil/ClassFileParser.hpp +++ b/runtime/bcutil/ClassFileParser.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ClassFileWriter.cpp b/runtime/bcutil/ClassFileWriter.cpp index 92d4167e948..22e919adae1 100644 --- a/runtime/bcutil/ClassFileWriter.cpp +++ b/runtime/bcutil/ClassFileWriter.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ClassFileWriter.cpp diff --git a/runtime/bcutil/ClassFileWriter.hpp b/runtime/bcutil/ClassFileWriter.hpp index 1c540245e63..de1a734343a 100644 --- a/runtime/bcutil/ClassFileWriter.hpp +++ b/runtime/bcutil/ClassFileWriter.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ClassFileWriter.hpp diff --git a/runtime/bcutil/ComparingCursor.cpp b/runtime/bcutil/ComparingCursor.cpp index 3c6f06265a5..891c5eb0779 100644 --- a/runtime/bcutil/ComparingCursor.cpp +++ b/runtime/bcutil/ComparingCursor.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ComparingCursor.cpp diff --git a/runtime/bcutil/ComparingCursor.hpp b/runtime/bcutil/ComparingCursor.hpp index b5772b531cf..5b2d67dc2d7 100644 --- a/runtime/bcutil/ComparingCursor.hpp +++ b/runtime/bcutil/ComparingCursor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ComparingCursorHelper.hpp b/runtime/bcutil/ComparingCursorHelper.hpp index 75d9ddeedb2..603de858dc3 100644 --- a/runtime/bcutil/ComparingCursorHelper.hpp +++ b/runtime/bcutil/ComparingCursorHelper.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ConstantPoolMap.cpp b/runtime/bcutil/ConstantPoolMap.cpp index 4c84ebacef5..12d463148d2 100644 --- a/runtime/bcutil/ConstantPoolMap.cpp +++ b/runtime/bcutil/ConstantPoolMap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ConstantPoolMap.cpp diff --git a/runtime/bcutil/ConstantPoolMap.hpp b/runtime/bcutil/ConstantPoolMap.hpp index 9b1b3ab748c..4fb87f85449 100644 --- a/runtime/bcutil/ConstantPoolMap.hpp +++ b/runtime/bcutil/ConstantPoolMap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/Cursor.hpp b/runtime/bcutil/Cursor.hpp index 33340b9e96b..b66a84dfd4e 100644 --- a/runtime/bcutil/Cursor.hpp +++ b/runtime/bcutil/Cursor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/J9PortAllocationStrategy.cpp b/runtime/bcutil/J9PortAllocationStrategy.cpp index 4818a61883b..e3b7ada84a1 100644 --- a/runtime/bcutil/J9PortAllocationStrategy.cpp +++ b/runtime/bcutil/J9PortAllocationStrategy.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * J9PortAllocationStrategy.cpp diff --git a/runtime/bcutil/J9PortAllocationStrategy.hpp b/runtime/bcutil/J9PortAllocationStrategy.hpp index e46307d1783..7e70800cb63 100644 --- a/runtime/bcutil/J9PortAllocationStrategy.hpp +++ b/runtime/bcutil/J9PortAllocationStrategy.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ROMClassBuilder.cpp b/runtime/bcutil/ROMClassBuilder.cpp index c3312e6237e..d79f7becfd5 100644 --- a/runtime/bcutil/ROMClassBuilder.cpp +++ b/runtime/bcutil/ROMClassBuilder.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ROMClassBuilder.cpp diff --git a/runtime/bcutil/ROMClassBuilder.hpp b/runtime/bcutil/ROMClassBuilder.hpp index daa9748d34a..de0b4d7ff53 100644 --- a/runtime/bcutil/ROMClassBuilder.hpp +++ b/runtime/bcutil/ROMClassBuilder.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ROMClassCreationContext.cpp b/runtime/bcutil/ROMClassCreationContext.cpp index 639b56fcf61..a2f3d406594 100644 --- a/runtime/bcutil/ROMClassCreationContext.cpp +++ b/runtime/bcutil/ROMClassCreationContext.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ROMClassCreationContext.hpp" diff --git a/runtime/bcutil/ROMClassCreationContext.hpp b/runtime/bcutil/ROMClassCreationContext.hpp index 6d42a0b4fef..4a79605d1dc 100644 --- a/runtime/bcutil/ROMClassCreationContext.hpp +++ b/runtime/bcutil/ROMClassCreationContext.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ROMCLASSCREATIONCONTEXT_HPP_ diff --git a/runtime/bcutil/ROMClassCreationPhase.hpp b/runtime/bcutil/ROMClassCreationPhase.hpp index 8f4012612f4..a537a389483 100644 --- a/runtime/bcutil/ROMClassCreationPhase.hpp +++ b/runtime/bcutil/ROMClassCreationPhase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ROMCLASSCREATIONPHASE_HPP_ diff --git a/runtime/bcutil/ROMClassHashTable.c b/runtime/bcutil/ROMClassHashTable.c index 545b58479b2..5724e987e4e 100644 --- a/runtime/bcutil/ROMClassHashTable.c +++ b/runtime/bcutil/ROMClassHashTable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/bcutil/ROMClassSegmentAllocationStrategy.cpp b/runtime/bcutil/ROMClassSegmentAllocationStrategy.cpp index 9cf95ad91ba..db3ca4f541b 100644 --- a/runtime/bcutil/ROMClassSegmentAllocationStrategy.cpp +++ b/runtime/bcutil/ROMClassSegmentAllocationStrategy.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ROMClassSegmentAllocationStrategy.cpp diff --git a/runtime/bcutil/ROMClassSegmentAllocationStrategy.hpp b/runtime/bcutil/ROMClassSegmentAllocationStrategy.hpp index a385f5035ff..34a9efd6803 100644 --- a/runtime/bcutil/ROMClassSegmentAllocationStrategy.hpp +++ b/runtime/bcutil/ROMClassSegmentAllocationStrategy.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ROMClassStringInternManager.cpp b/runtime/bcutil/ROMClassStringInternManager.cpp index 2c5cabfcfaf..62abe30bd16 100644 --- a/runtime/bcutil/ROMClassStringInternManager.cpp +++ b/runtime/bcutil/ROMClassStringInternManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ROMClassStringInternManager.cpp diff --git a/runtime/bcutil/ROMClassStringInternManager.hpp b/runtime/bcutil/ROMClassStringInternManager.hpp index 2e190aff3ea..3590f62bbdf 100644 --- a/runtime/bcutil/ROMClassStringInternManager.hpp +++ b/runtime/bcutil/ROMClassStringInternManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/ROMClassVerbosePhase.hpp b/runtime/bcutil/ROMClassVerbosePhase.hpp index 9e355f83f36..87d10cd0e3c 100644 --- a/runtime/bcutil/ROMClassVerbosePhase.hpp +++ b/runtime/bcutil/ROMClassVerbosePhase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/bcutil/ROMClassWriter.cpp b/runtime/bcutil/ROMClassWriter.cpp index 932fc1f1876..d0decb90a00 100644 --- a/runtime/bcutil/ROMClassWriter.cpp +++ b/runtime/bcutil/ROMClassWriter.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * ROMClassWriter.cpp diff --git a/runtime/bcutil/ROMClassWriter.hpp b/runtime/bcutil/ROMClassWriter.hpp index d284ee287c2..a56831f3565 100644 --- a/runtime/bcutil/ROMClassWriter.hpp +++ b/runtime/bcutil/ROMClassWriter.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/SRPKeyProducer.cpp b/runtime/bcutil/SRPKeyProducer.cpp index 2a159e50d92..9f833f89f20 100644 --- a/runtime/bcutil/SRPKeyProducer.cpp +++ b/runtime/bcutil/SRPKeyProducer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * SRPKeyProducer.cpp diff --git a/runtime/bcutil/SRPKeyProducer.hpp b/runtime/bcutil/SRPKeyProducer.hpp index 3decdf0321f..13e0da8ff9c 100644 --- a/runtime/bcutil/SRPKeyProducer.hpp +++ b/runtime/bcutil/SRPKeyProducer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/SRPOffsetTable.cpp b/runtime/bcutil/SRPOffsetTable.cpp index cdabedc06e6..adddcbbc58e 100644 --- a/runtime/bcutil/SRPOffsetTable.cpp +++ b/runtime/bcutil/SRPOffsetTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * SRPOffsetTable.cpp diff --git a/runtime/bcutil/SRPOffsetTable.hpp b/runtime/bcutil/SRPOffsetTable.hpp index cc338c7117e..fdade79b99f 100644 --- a/runtime/bcutil/SRPOffsetTable.hpp +++ b/runtime/bcutil/SRPOffsetTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/StringInternTable.cpp b/runtime/bcutil/StringInternTable.cpp index 79f4cf24191..f4a0bd3dbd9 100644 --- a/runtime/bcutil/StringInternTable.cpp +++ b/runtime/bcutil/StringInternTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * StringInternTable.cpp diff --git a/runtime/bcutil/StringInternTable.hpp b/runtime/bcutil/StringInternTable.hpp index 92c00f10199..c7f07a32a05 100644 --- a/runtime/bcutil/StringInternTable.hpp +++ b/runtime/bcutil/StringInternTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/SuppliedBufferAllocationStrategy.hpp b/runtime/bcutil/SuppliedBufferAllocationStrategy.hpp index 8bef3fa956a..31ef100797e 100644 --- a/runtime/bcutil/SuppliedBufferAllocationStrategy.hpp +++ b/runtime/bcutil/SuppliedBufferAllocationStrategy.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/WritingCursor.cpp b/runtime/bcutil/WritingCursor.cpp index e63a8867622..8e02d93ece4 100644 --- a/runtime/bcutil/WritingCursor.cpp +++ b/runtime/bcutil/WritingCursor.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * WritingCursor.cpp diff --git a/runtime/bcutil/WritingCursor.hpp b/runtime/bcutil/WritingCursor.hpp index b487a66f8a0..c3e8b605568 100644 --- a/runtime/bcutil/WritingCursor.hpp +++ b/runtime/bcutil/WritingCursor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/attrlookup.gperf b/runtime/bcutil/attrlookup.gperf index 8ee89849200..1587eda43dc 100644 --- a/runtime/bcutil/attrlookup.gperf +++ b/runtime/bcutil/attrlookup.gperf @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/bcutil/attrlookup.h b/runtime/bcutil/attrlookup.h index 220df99dea0..45785ff6f46 100644 --- a/runtime/bcutil/attrlookup.h +++ b/runtime/bcutil/attrlookup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* ANSI-C code produced by gperf version 3.0.4 */ diff --git a/runtime/bcutil/bcutil.c b/runtime/bcutil/bcutil.c index 03c2b33dfe8..9dcdc952559 100644 --- a/runtime/bcutil/bcutil.c +++ b/runtime/bcutil/bcutil.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcutil/bcutil_internal.h b/runtime/bcutil/bcutil_internal.h index 010259212bd..7d3f3015050 100644 --- a/runtime/bcutil/bcutil_internal.h +++ b/runtime/bcutil/bcutil_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcutil_internal_h diff --git a/runtime/bcutil/cfreader.c b/runtime/bcutil/cfreader.c index 417ba5be2ed..80b0b14165e 100644 --- a/runtime/bcutil/cfreader.c +++ b/runtime/bcutil/cfreader.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "cfreader.h" diff --git a/runtime/bcutil/defineclass.c b/runtime/bcutil/defineclass.c index 3ada8299a58..73aafbcaaa0 100644 --- a/runtime/bcutil/defineclass.c +++ b/runtime/bcutil/defineclass.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcutil/dynload.c b/runtime/bcutil/dynload.c index a2b526ce399..d78feb2e655 100644 --- a/runtime/bcutil/dynload.c +++ b/runtime/bcutil/dynload.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcutil/dynload.h b/runtime/bcutil/dynload.h index 5bd8619b4bf..eaddcd7d09c 100644 --- a/runtime/bcutil/dynload.h +++ b/runtime/bcutil/dynload.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef dynload_h diff --git a/runtime/bcutil/j9bcu.tdf b/runtime/bcutil/j9bcu.tdf index 6574f1ad1a0..bd7052481bd 100644 --- a/runtime/bcutil/j9bcu.tdf +++ b/runtime/bcutil/j9bcu.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9bcu diff --git a/runtime/bcutil/jimageintf.c b/runtime/bcutil/jimageintf.c index 00bfdfa0ff6..b8c6fb9483d 100644 --- a/runtime/bcutil/jimageintf.c +++ b/runtime/bcutil/jimageintf.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "bcutil_api.h" diff --git a/runtime/bcutil/jimagereader.c b/runtime/bcutil/jimagereader.c index 44d71f75e77..e0584015ff7 100644 --- a/runtime/bcutil/jimagereader.c +++ b/runtime/bcutil/jimagereader.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "bcutil_api.h" diff --git a/runtime/bcutil/jsrinliner.c b/runtime/bcutil/jsrinliner.c index fba444d1d6d..4bd2cb8c0c0 100644 --- a/runtime/bcutil/jsrinliner.c +++ b/runtime/bcutil/jsrinliner.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9JSRI_DEBUG 0 diff --git a/runtime/bcutil/module.xml b/runtime/bcutil/module.xml index 56a92acceea..1b7deb960df 100644 --- a/runtime/bcutil/module.xml +++ b/runtime/bcutil/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/bcutil/romphase.h b/runtime/bcutil/romphase.h index f3e457e320d..762cf9c2b07 100644 --- a/runtime/bcutil/romphase.h +++ b/runtime/bcutil/romphase.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/bcutil/test/dyntest/CMakeLists.txt b/runtime/bcutil/test/dyntest/CMakeLists.txt index 6391622c5d1..0ee9bf970c1 100644 --- a/runtime/bcutil/test/dyntest/CMakeLists.txt +++ b/runtime/bcutil/test/dyntest/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set_source_files_properties(${j9vm_BINARY_DIR}/bcutil/ut_j9bcu.c PROPERTIES GENERATED TRUE) diff --git a/runtime/bcutil/test/dyntest/intern_tests.cpp b/runtime/bcutil/test/dyntest/intern_tests.cpp index 6fc8eb1c84b..5c478b69843 100644 --- a/runtime/bcutil/test/dyntest/intern_tests.cpp +++ b/runtime/bcutil/test/dyntest/intern_tests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/bcutil/test/dyntest/lineNumber_tests.c b/runtime/bcutil/test/dyntest/lineNumber_tests.c index 6ec4c7312f9..081dbf5cc6e 100644 --- a/runtime/bcutil/test/dyntest/lineNumber_tests.c +++ b/runtime/bcutil/test/dyntest/lineNumber_tests.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/bcutil/test/dyntest/localVariableTable_tests.c b/runtime/bcutil/test/dyntest/localVariableTable_tests.c index 4d1d8b6fb92..2ba57ea7fbb 100644 --- a/runtime/bcutil/test/dyntest/localVariableTable_tests.c +++ b/runtime/bcutil/test/dyntest/localVariableTable_tests.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/bcutil/test/dyntest/misc_tests.cpp b/runtime/bcutil/test/dyntest/misc_tests.cpp index 94d01bdffe1..1fe9d1ae49c 100644 --- a/runtime/bcutil/test/dyntest/misc_tests.cpp +++ b/runtime/bcutil/test/dyntest/misc_tests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/bcutil/test/dyntest/module.xml b/runtime/bcutil/test/dyntest/module.xml index 3f19a7858a0..7e79f0c16d1 100644 --- a/runtime/bcutil/test/dyntest/module.xml +++ b/runtime/bcutil/test/dyntest/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/bcutil/test/dyntest/romclass_compare.c b/runtime/bcutil/test/dyntest/romclass_compare.c index f54ae9f6442..14b9ad9e7e5 100644 --- a/runtime/bcutil/test/dyntest/romclass_compare.c +++ b/runtime/bcutil/test/dyntest/romclass_compare.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" #include "j9.h" diff --git a/runtime/bcutil/test/dyntest/romclass_correctness.c b/runtime/bcutil/test/dyntest/romclass_correctness.c index db9fa58c020..f71ab4946a6 100644 --- a/runtime/bcutil/test/dyntest/romclass_correctness.c +++ b/runtime/bcutil/test/dyntest/romclass_correctness.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" #include "j9.h" diff --git a/runtime/bcutil/test/dyntest/romclass_testing.c b/runtime/bcutil/test/dyntest/romclass_testing.c index 4bedf627014..17253f60f2c 100644 --- a/runtime/bcutil/test/dyntest/romclass_testing.c +++ b/runtime/bcutil/test/dyntest/romclass_testing.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcutil/test/dyntest/testHelpers.c b/runtime/bcutil/test/dyntest/testHelpers.c index 8a351edaa8d..dfc697d7cf7 100644 --- a/runtime/bcutil/test/dyntest/testHelpers.c +++ b/runtime/bcutil/test/dyntest/testHelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcutil/test/dyntest/testHelpers.h b/runtime/bcutil/test/dyntest/testHelpers.h index 69f2f513622..d489639d91b 100644 --- a/runtime/bcutil/test/dyntest/testHelpers.h +++ b/runtime/bcutil/test/dyntest/testHelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/bcutil/test/natives/CMakeLists.txt b/runtime/bcutil/test/natives/CMakeLists.txt index 98bdadee5c3..3264389cb28 100644 --- a/runtime/bcutil/test/natives/CMakeLists.txt +++ b/runtime/bcutil/test/natives/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(bcuwhite SHARED diff --git a/runtime/bcutil/test/natives/bcunatives.c b/runtime/bcutil/test/natives/bcunatives.c index 88bd98d6699..7c809516bb1 100644 --- a/runtime/bcutil/test/natives/bcunatives.c +++ b/runtime/bcutil/test/natives/bcunatives.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/bcutil/test/natives/module.xml b/runtime/bcutil/test/natives/module.xml index ba74060601b..e5a2ab4144e 100644 --- a/runtime/bcutil/test/natives/module.xml +++ b/runtime/bcutil/test/natives/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/bcutil/test/recompiled/CMakeLists.txt b/runtime/bcutil/test/recompiled/CMakeLists.txt index 409945f35de..77da5138857 100644 --- a/runtime/bcutil/test/recompiled/CMakeLists.txt +++ b/runtime/bcutil/test/recompiled/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/bcutil/test/recompiled/module.xml b/runtime/bcutil/test/recompiled/module.xml index 32e477badd8..97289c81f48 100644 --- a/runtime/bcutil/test/recompiled/module.xml +++ b/runtime/bcutil/test/recompiled/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/bcutil/verifyerrstring.c b/runtime/bcutil/verifyerrstring.c index 35fe28c7a5f..02f160cb819 100644 --- a/runtime/bcutil/verifyerrstring.c +++ b/runtime/bcutil/verifyerrstring.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/bcverify/CMakeLists.txt b/runtime/bcverify/CMakeLists.txt index b1d77cd2e82..cc979b2edd6 100644 --- a/runtime/bcverify/CMakeLists.txt +++ b/runtime/bcverify/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ #TODO specify -O3 for zos diff --git a/runtime/bcverify/bcvcfr.h b/runtime/bcverify/bcvcfr.h index d46e7752052..e64a55bc0b3 100644 --- a/runtime/bcverify/bcvcfr.h +++ b/runtime/bcverify/bcvcfr.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/bcverify/bcverify.c b/runtime/bcverify/bcverify.c index 8e82adb9765..bf992d4d0d9 100644 --- a/runtime/bcverify/bcverify.c +++ b/runtime/bcverify/bcverify.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcverify/bcverify.java b/runtime/bcverify/bcverify.java index c28a2300745..bb726950b7a 100644 --- a/runtime/bcverify/bcverify.java +++ b/runtime/bcverify/bcverify.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* JAVACODE */ diff --git a/runtime/bcverify/bcverify_internal.h b/runtime/bcverify/bcverify_internal.h index cc02755853a..cd0ef824246 100644 --- a/runtime/bcverify/bcverify_internal.h +++ b/runtime/bcverify/bcverify_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcverify_internal_h diff --git a/runtime/bcverify/classrelationships.c b/runtime/bcverify/classrelationships.c index ee002ecfcb0..5c5def7e2dd 100644 --- a/runtime/bcverify/classrelationships.c +++ b/runtime/bcverify/classrelationships.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/bcverify/clconstraints.c b/runtime/bcverify/clconstraints.c index 3168327b4d8..d5daa835fc0 100644 --- a/runtime/bcverify/clconstraints.c +++ b/runtime/bcverify/clconstraints.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcverify/j9bcverify.tdf b/runtime/bcverify/j9bcverify.tdf index faa57517747..460f040d597 100644 --- a/runtime/bcverify/j9bcverify.tdf +++ b/runtime/bcverify/j9bcverify.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9bcverify diff --git a/runtime/bcverify/module.xml b/runtime/bcverify/module.xml index f56e6a346a7..9a11fe73c0b 100644 --- a/runtime/bcverify/module.xml +++ b/runtime/bcverify/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/bcverify/rtverify.c b/runtime/bcverify/rtverify.c index 845c59fad9b..b5cf03b0633 100644 --- a/runtime/bcverify/rtverify.c +++ b/runtime/bcverify/rtverify.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "bcvcfr.h" diff --git a/runtime/bcverify/staticverify.c b/runtime/bcverify/staticverify.c index 328ff5bd6a0..dcc38cdc136 100644 --- a/runtime/bcverify/staticverify.c +++ b/runtime/bcverify/staticverify.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/bcverify/vrfyconvert.c b/runtime/bcverify/vrfyconvert.c index a48e1d8c967..c804e4ff9bf 100644 --- a/runtime/bcverify/vrfyconvert.c +++ b/runtime/bcverify/vrfyconvert.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/bcverify/vrfyconvert.h b/runtime/bcverify/vrfyconvert.h index 678fe4c5596..5c41635d0e0 100644 --- a/runtime/bcverify/vrfyconvert.h +++ b/runtime/bcverify/vrfyconvert.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vrfyconvert_h diff --git a/runtime/bcverify/vrfyhelp.c b/runtime/bcverify/vrfyhelp.c index c9635eb90af..47a8de8d364 100644 --- a/runtime/bcverify/vrfyhelp.c +++ b/runtime/bcverify/vrfyhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "bcvcfr.h" diff --git a/runtime/buildtools.mk b/runtime/buildtools.mk index ab01697a929..7e889d6dfe5 100644 --- a/runtime/buildtools.mk +++ b/runtime/buildtools.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### define \n diff --git a/runtime/cassume/CMakeLists.txt b/runtime/cassume/CMakeLists.txt index 617bd8eec22..46ac0513fac 100644 --- a/runtime/cassume/CMakeLists.txt +++ b/runtime/cassume/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/cassume/basesize.c b/runtime/cassume/basesize.c index 691610b750f..a5e91bfc725 100644 --- a/runtime/cassume/basesize.c +++ b/runtime/cassume/basesize.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ctest.h" diff --git a/runtime/cassume/basesize.h b/runtime/cassume/basesize.h index 1913b8a2a40..7b90265916d 100644 --- a/runtime/cassume/basesize.h +++ b/runtime/cassume/basesize.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef basesize_h diff --git a/runtime/cassume/cassume_internal.h b/runtime/cassume/cassume_internal.h index 5ae2e67dd2b..56d7fccaaca 100644 --- a/runtime/cassume/cassume_internal.h +++ b/runtime/cassume/cassume_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef cassume_internal_h diff --git a/runtime/cassume/ctest.c b/runtime/cassume/ctest.c index b4c18193833..cf6d9fb6ebb 100644 --- a/runtime/cassume/ctest.c +++ b/runtime/cassume/ctest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ctest.h" diff --git a/runtime/cassume/ctest.h b/runtime/cassume/ctest.h index 2c2cc2f1b65..68e3f93471d 100644 --- a/runtime/cassume/ctest.h +++ b/runtime/cassume/ctest.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ctest_h #define ctest_h diff --git a/runtime/cassume/module.xml b/runtime/cassume/module.xml index d894a845705..aaff7988220 100644 --- a/runtime/cassume/module.xml +++ b/runtime/cassume/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/cassume/vatest.c b/runtime/cassume/vatest.c index c67813e9f5a..a958800dbf9 100644 --- a/runtime/cassume/vatest.c +++ b/runtime/cassume/vatest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/cassume/vatest.h b/runtime/cassume/vatest.h index 57b65090ae5..ae0ca2daccf 100644 --- a/runtime/cassume/vatest.h +++ b/runtime/cassume/vatest.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vatest_h diff --git a/runtime/cfdumper/CMakeLists.txt b/runtime/cfdumper/CMakeLists.txt index c19dcb4190b..5ef0ddd641d 100644 --- a/runtime/cfdumper/CMakeLists.txt +++ b/runtime/cfdumper/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/cfdumper/cfdumper_internal.h b/runtime/cfdumper/cfdumper_internal.h index 437cc599c53..1d4760c1d40 100644 --- a/runtime/cfdumper/cfdumper_internal.h +++ b/runtime/cfdumper/cfdumper_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef cfdumper_internal_h diff --git a/runtime/cfdumper/main.c b/runtime/cfdumper/main.c index 1ef68791dd4..52f3b695cea 100644 --- a/runtime/cfdumper/main.c +++ b/runtime/cfdumper/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/cfdumper/module.xml b/runtime/cfdumper/module.xml index fc9de37cc19..92c978adc18 100644 --- a/runtime/cfdumper/module.xml +++ b/runtime/cfdumper/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/cfdumper/pvdump.c b/runtime/cfdumper/pvdump.c index 2e4b206b4eb..fee6eb9a6bf 100644 --- a/runtime/cfdumper/pvdump.c +++ b/runtime/cfdumper/pvdump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/cfdumper/romdump.c b/runtime/cfdumper/romdump.c index 85076c02d4e..25448d7f8a8 100644 --- a/runtime/cfdumper/romdump.c +++ b/runtime/cfdumper/romdump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/cfdumper/stubs.c b/runtime/cfdumper/stubs.c index b6ef92fd0f5..8ef4543de11 100644 --- a/runtime/cfdumper/stubs.c +++ b/runtime/cfdumper/stubs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/cmake/J9vmGenAsm.cmake b/runtime/cmake/J9vmGenAsm.cmake index ac664d09a4e..69e72b5ee67 100644 --- a/runtime/cmake/J9vmGenAsm.cmake +++ b/runtime/cmake/J9vmGenAsm.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Include once diff --git a/runtime/cmake/J9vmTargetSupport.cmake b/runtime/cmake/J9vmTargetSupport.cmake index 83ad7d1cc5e..f4f85c2e5c0 100644 --- a/runtime/cmake/J9vmTargetSupport.cmake +++ b/runtime/cmake/J9vmTargetSupport.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include(OmrTargetSupport) diff --git a/runtime/cmake/build_tags.cmake b/runtime/cmake/build_tags.cmake index 51f77add40a..4980d0ceeae 100644 --- a/runtime/cmake/build_tags.cmake +++ b/runtime/cmake/build_tags.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ string(TIMESTAMP J9VM_CURRENT_YEAR "%Y") diff --git a/runtime/cmake/caches/aix_ppc-64.cmake b/runtime/cmake/caches/aix_ppc-64.cmake index 2996fe53c6c..33b9c4f2ece 100644 --- a/runtime/cmake/caches/aix_ppc-64.cmake +++ b/runtime/cmake/caches/aix_ppc-64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ #TODO: Env vars should be auto detected by platform diff --git a/runtime/cmake/caches/aix_ppc-64_cmprssptrs.cmake b/runtime/cmake/caches/aix_ppc-64_cmprssptrs.cmake index bf8d176692b..2b70d060d65 100644 --- a/runtime/cmake/caches/aix_ppc-64_cmprssptrs.cmake +++ b/runtime/cmake/caches/aix_ppc-64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/aix_ppc-64_mxdptrs.cmake b/runtime/cmake/caches/aix_ppc-64_mxdptrs.cmake index 7c617de81b0..37b0061563a 100644 --- a/runtime/cmake/caches/aix_ppc-64_mxdptrs.cmake +++ b/runtime/cmake/caches/aix_ppc-64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/cmprssptrs.cmake b/runtime/cmake/caches/cmprssptrs.cmake index d7a978babd1..236dbddaaf9 100644 --- a/runtime/cmake/caches/cmprssptrs.cmake +++ b/runtime/cmake/caches/cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_GC_POINTER_MODE "compressed" CACHE STRING "") diff --git a/runtime/cmake/caches/common.cmake b/runtime/cmake/caches/common.cmake index b6021c1ea57..69270f298eb 100644 --- a/runtime/cmake/caches/common.cmake +++ b/runtime/cmake/caches/common.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ #TODO Platform hacks diff --git a/runtime/cmake/caches/linux.cmake b/runtime/cmake/caches/linux.cmake index b2439659ae9..a7abafd74be 100644 --- a/runtime/cmake/caches/linux.cmake +++ b/runtime/cmake/caches/linux.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_GC_ENABLE_DOUBLE_MAP ON CACHE BOOL "") diff --git a/runtime/cmake/caches/linux_390-64.cmake b/runtime/cmake/caches/linux_390-64.cmake index 3edcfd9a6f3..31f385b8e19 100644 --- a/runtime/cmake/caches/linux_390-64.cmake +++ b/runtime/cmake/caches/linux_390-64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ #TODO Platform hacks diff --git a/runtime/cmake/caches/linux_390-64_cmprssptrs.cmake b/runtime/cmake/caches/linux_390-64_cmprssptrs.cmake index a35504efe07..da3b47b1d1a 100644 --- a/runtime/cmake/caches/linux_390-64_cmprssptrs.cmake +++ b/runtime/cmake/caches/linux_390-64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/linux_390-64_mxdptrs.cmake b/runtime/cmake/caches/linux_390-64_mxdptrs.cmake index 9b5f0cf2991..70087125857 100644 --- a/runtime/cmake/caches/linux_390-64_mxdptrs.cmake +++ b/runtime/cmake/caches/linux_390-64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/linux_aarch64.cmake b/runtime/cmake/caches/linux_aarch64.cmake index 2e8c0bd3d97..e63a1686db8 100644 --- a/runtime/cmake/caches/linux_aarch64.cmake +++ b/runtime/cmake/caches/linux_aarch64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_AARCH64 ON CACHE BOOL "") diff --git a/runtime/cmake/caches/linux_aarch64_cmprssptrs.cmake b/runtime/cmake/caches/linux_aarch64_cmprssptrs.cmake index 46c33e4586d..8508328633a 100644 --- a/runtime/cmake/caches/linux_aarch64_cmprssptrs.cmake +++ b/runtime/cmake/caches/linux_aarch64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/linux_aarch64_mxdptrs.cmake b/runtime/cmake/caches/linux_aarch64_mxdptrs.cmake index 9e66142e3ee..53cfd7af2ff 100644 --- a/runtime/cmake/caches/linux_aarch64_mxdptrs.cmake +++ b/runtime/cmake/caches/linux_aarch64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/linux_ppc-64_cmprssptrs_le.cmake b/runtime/cmake/caches/linux_ppc-64_cmprssptrs_le.cmake index 8aa071bd46a..f7a15cd5711 100644 --- a/runtime/cmake/caches/linux_ppc-64_cmprssptrs_le.cmake +++ b/runtime/cmake/caches/linux_ppc-64_cmprssptrs_le.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/linux_ppc-64_le.cmake b/runtime/cmake/caches/linux_ppc-64_le.cmake index 2ffc8ee418f..90ba2d6a844 100644 --- a/runtime/cmake/caches/linux_ppc-64_le.cmake +++ b/runtime/cmake/caches/linux_ppc-64_le.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # TODO Platform hacks diff --git a/runtime/cmake/caches/linux_ppc-64_mxdptrs_le.cmake b/runtime/cmake/caches/linux_ppc-64_mxdptrs_le.cmake index b1e88da9345..e11fd4e9636 100644 --- a/runtime/cmake/caches/linux_ppc-64_mxdptrs_le.cmake +++ b/runtime/cmake/caches/linux_ppc-64_mxdptrs_le.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/linux_riscv64.cmake b/runtime/cmake/caches/linux_riscv64.cmake index 7eda5dbff7e..135675c4537 100644 --- a/runtime/cmake/caches/linux_riscv64.cmake +++ b/runtime/cmake/caches/linux_riscv64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_RISCV ON CACHE BOOL "") diff --git a/runtime/cmake/caches/linux_riscv64_cmprssptrs.cmake b/runtime/cmake/caches/linux_riscv64_cmprssptrs.cmake index dfdd60721e4..fb4fcbe5732 100644 --- a/runtime/cmake/caches/linux_riscv64_cmprssptrs.cmake +++ b/runtime/cmake/caches/linux_riscv64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/linux_riscv64_mxdptrs.cmake b/runtime/cmake/caches/linux_riscv64_mxdptrs.cmake index 1c9f5a8bbf4..04c9204b7f9 100644 --- a/runtime/cmake/caches/linux_riscv64_mxdptrs.cmake +++ b/runtime/cmake/caches/linux_riscv64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/linux_x86-64.cmake b/runtime/cmake/caches/linux_x86-64.cmake index ba0aa78740b..bbf66c4d7d1 100644 --- a/runtime/cmake/caches/linux_x86-64.cmake +++ b/runtime/cmake/caches/linux_x86-64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ #TODO Platform hacks diff --git a/runtime/cmake/caches/linux_x86-64_cmprssptrs.cmake b/runtime/cmake/caches/linux_x86-64_cmprssptrs.cmake index 26a7c2a30df..539f857bbfa 100644 --- a/runtime/cmake/caches/linux_x86-64_cmprssptrs.cmake +++ b/runtime/cmake/caches/linux_x86-64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/linux_x86-64_mxdptrs.cmake b/runtime/cmake/caches/linux_x86-64_mxdptrs.cmake index aa3c0617aba..15fc97dfef4 100644 --- a/runtime/cmake/caches/linux_x86-64_mxdptrs.cmake +++ b/runtime/cmake/caches/linux_x86-64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/mxdptrs.cmake b/runtime/cmake/caches/mxdptrs.cmake index 6d71d013362..8a191a971cd 100644 --- a/runtime/cmake/caches/mxdptrs.cmake +++ b/runtime/cmake/caches/mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_GC_POINTER_MODE "mixed" CACHE STRING "") diff --git a/runtime/cmake/caches/osx_aarch64.cmake b/runtime/cmake/caches/osx_aarch64.cmake index 0e0fed3a92a..db52447b7c1 100644 --- a/runtime/cmake/caches/osx_aarch64.cmake +++ b/runtime/cmake/caches/osx_aarch64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_AARCH64 ON CACHE BOOL "") diff --git a/runtime/cmake/caches/osx_aarch64_cmprssptrs.cmake b/runtime/cmake/caches/osx_aarch64_cmprssptrs.cmake index 3334ecb5aa2..4c13c254e91 100644 --- a/runtime/cmake/caches/osx_aarch64_cmprssptrs.cmake +++ b/runtime/cmake/caches/osx_aarch64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/osx_aarch64_mxdptrs.cmake b/runtime/cmake/caches/osx_aarch64_mxdptrs.cmake index 4ee5f8acf37..5dd33031e08 100644 --- a/runtime/cmake/caches/osx_aarch64_mxdptrs.cmake +++ b/runtime/cmake/caches/osx_aarch64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/osx_x86-64.cmake b/runtime/cmake/caches/osx_x86-64.cmake index 0ede8ed40e9..18f9ba5e1d7 100644 --- a/runtime/cmake/caches/osx_x86-64.cmake +++ b/runtime/cmake/caches/osx_x86-64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_X86 ON CACHE BOOL "") diff --git a/runtime/cmake/caches/osx_x86-64_cmprssptrs.cmake b/runtime/cmake/caches/osx_x86-64_cmprssptrs.cmake index 2aae7b1c121..b3e46dbda5f 100644 --- a/runtime/cmake/caches/osx_x86-64_cmprssptrs.cmake +++ b/runtime/cmake/caches/osx_x86-64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/osx_x86-64_mxdptrs.cmake b/runtime/cmake/caches/osx_x86-64_mxdptrs.cmake index 153caa539b2..41bb14d7327 100644 --- a/runtime/cmake/caches/osx_x86-64_mxdptrs.cmake +++ b/runtime/cmake/caches/osx_x86-64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/win_x86-64.cmake b/runtime/cmake/caches/win_x86-64.cmake index aee6fca57ce..fa00767f1dd 100644 --- a/runtime/cmake/caches/win_x86-64.cmake +++ b/runtime/cmake/caches/win_x86-64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_X86 ON CACHE BOOL "") diff --git a/runtime/cmake/caches/win_x86-64_cmprssptrs.cmake b/runtime/cmake/caches/win_x86-64_cmprssptrs.cmake index fe467cf70c8..598ecd22f23 100644 --- a/runtime/cmake/caches/win_x86-64_cmprssptrs.cmake +++ b/runtime/cmake/caches/win_x86-64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/win_x86-64_mxdptrs.cmake b/runtime/cmake/caches/win_x86-64_mxdptrs.cmake index eec08f61d99..894fa511852 100644 --- a/runtime/cmake/caches/win_x86-64_mxdptrs.cmake +++ b/runtime/cmake/caches/win_x86-64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/caches/win_x86.cmake b/runtime/cmake/caches/win_x86.cmake index b2e8bce8ca7..006e7b54e13 100644 --- a/runtime/cmake/caches/win_x86.cmake +++ b/runtime/cmake/caches/win_x86.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_X86 ON CACHE BOOL "") diff --git a/runtime/cmake/caches/zos_390-64.cmake b/runtime/cmake/caches/zos_390-64.cmake index b86a77e3168..5640d0b3682 100644 --- a/runtime/cmake/caches/zos_390-64.cmake +++ b/runtime/cmake/caches/zos_390-64.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_ARCH_S390 ON CACHE BOOL "") diff --git a/runtime/cmake/caches/zos_390-64_cmprssptrs.cmake b/runtime/cmake/caches/zos_390-64_cmprssptrs.cmake index 0c4c1396934..eda0e8646c2 100644 --- a/runtime/cmake/caches/zos_390-64_cmprssptrs.cmake +++ b/runtime/cmake/caches/zos_390-64_cmprssptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/cmprssptrs.cmake") diff --git a/runtime/cmake/caches/zos_390-64_mxdptrs.cmake b/runtime/cmake/caches/zos_390-64_mxdptrs.cmake index d9abb205796..2c0deec0d5c 100644 --- a/runtime/cmake/caches/zos_390-64_mxdptrs.cmake +++ b/runtime/cmake/caches/zos_390-64_mxdptrs.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include("${CMAKE_CURRENT_LIST_DIR}/mxdptrs.cmake") diff --git a/runtime/cmake/modules/CMakeDetermineJ9VM_CXXCompiler.cmake b/runtime/cmake/modules/CMakeDetermineJ9VM_CXXCompiler.cmake index a8b61401476..1b1a7500d4f 100644 --- a/runtime/cmake/modules/CMakeDetermineJ9VM_CXXCompiler.cmake +++ b/runtime/cmake/modules/CMakeDetermineJ9VM_CXXCompiler.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(CMAKE_J9VM_CXX_COMPILER_LIST clang) diff --git a/runtime/cmake/modules/CMakeJ9VM_CXXCompiler.cmake.in b/runtime/cmake/modules/CMakeJ9VM_CXXCompiler.cmake.in index 25ef1c55fe3..c40c2a880e4 100644 --- a/runtime/cmake/modules/CMakeJ9VM_CXXCompiler.cmake.in +++ b/runtime/cmake/modules/CMakeJ9VM_CXXCompiler.cmake.in @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(CMAKE_J9VM_CXX_COMPILER "@CMAKE_J9VM_CXX_COMPILER@") diff --git a/runtime/cmake/modules/CMakeJ9VM_CXXInformation.cmake b/runtime/cmake/modules/CMakeJ9VM_CXXInformation.cmake index 2027130c886..1ef1f1dc2e0 100644 --- a/runtime/cmake/modules/CMakeJ9VM_CXXInformation.cmake +++ b/runtime/cmake/modules/CMakeJ9VM_CXXInformation.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(CMAKE_J9VM_CXX_DEFINE_FLAG -D) diff --git a/runtime/cmake/modules/CMakeTestJ9VM_CXXCompiler.cmake b/runtime/cmake/modules/CMakeTestJ9VM_CXXCompiler.cmake index 82218f2cb91..e41ecce0a45 100644 --- a/runtime/cmake/modules/CMakeTestJ9VM_CXXCompiler.cmake +++ b/runtime/cmake/modules/CMakeTestJ9VM_CXXCompiler.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(CMAKE_J9VM_CXX_COMPILER_WORKS 1 CACHE INTERNAL "") diff --git a/runtime/cmake/omr_config.cmake b/runtime/cmake/omr_config.cmake index 2ef8c4ca88f..16ef4d94947 100644 --- a/runtime/cmake/omr_config.cmake +++ b/runtime/cmake/omr_config.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Various config options we apply to OMR diff --git a/runtime/cmake/options.cmake b/runtime/cmake/options.cmake index 468853070b3..232e9f3f704 100644 --- a/runtime/cmake/options.cmake +++ b/runtime/cmake/options.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include(OmrAssert) diff --git a/runtime/cmake/platform.cmake b/runtime/cmake/platform.cmake index 34de1de809c..c388952b01d 100644 --- a/runtime/cmake/platform.cmake +++ b/runtime/cmake/platform.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Get OMR's platform config diff --git a/runtime/cmake/platform/os/aix.cmake b/runtime/cmake/platform/os/aix.cmake index 2ae7e9e09f5..9306d717312 100644 --- a/runtime/cmake/platform/os/aix.cmake +++ b/runtime/cmake/platform/os/aix.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Override cmake default of ".a" for shared libs on aix diff --git a/runtime/cmake/platform/os/osx.cmake b/runtime/cmake/platform/os/osx.cmake index 193c31ad42d..6899bec6ffd 100644 --- a/runtime/cmake/platform/os/osx.cmake +++ b/runtime/cmake/platform/os/osx.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # set OpenJ9 dylib versions diff --git a/runtime/cmake/platform/os/win.cmake b/runtime/cmake/platform/os/win.cmake index 84a4491f409..c4cbbac341f 100644 --- a/runtime/cmake/platform/os/win.cmake +++ b/runtime/cmake/platform/os/win.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Note: we need to inject WIN32 et al, as OMR no longer uses them diff --git a/runtime/cmake/platform/os/zos.cmake b/runtime/cmake/platform/os/zos.cmake index afde6e30070..674c3a8cdf5 100644 --- a/runtime/cmake/platform/os/zos.cmake +++ b/runtime/cmake/platform/os/zos.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(CMAKE_SHARED_LIBRARY_SUFFIX ".so") diff --git a/runtime/cmake/platform/toolcfg/gnu.cmake b/runtime/cmake/platform/toolcfg/gnu.cmake index ce63f3b6293..067e52df728 100644 --- a/runtime/cmake/platform/toolcfg/gnu.cmake +++ b/runtime/cmake/platform/toolcfg/gnu.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3 -g -fstack-protector) diff --git a/runtime/cmake/platform/toolcfg/msvc.cmake b/runtime/cmake/platform/toolcfg/msvc.cmake index 7f411db8aa5..a29e3256faf 100644 --- a/runtime/cmake/platform/toolcfg/msvc.cmake +++ b/runtime/cmake/platform/toolcfg/msvc.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ list(APPEND OMR_PLATFORM_DEFINITIONS diff --git a/runtime/cmake/platform/toolcfg/xlc.cmake b/runtime/cmake/platform/toolcfg/xlc.cmake index de8f2ef4fb3..e0804f699ad 100644 --- a/runtime/cmake/platform/toolcfg/xlc.cmake +++ b/runtime/cmake/platform/toolcfg/xlc.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ list(APPEND OMR_PLATFORM_COMPILE_OPTIONS -O3) diff --git a/runtime/cmake/shared_lib.rc.in b/runtime/cmake/shared_lib.rc.in index 2746e034870..32aa64993e2 100644 --- a/runtime/cmake/shared_lib.rc.in +++ b/runtime/cmake/shared_lib.rc.in @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/cmake/version.cmake b/runtime/cmake/version.cmake index be23eb37df3..cbe1b7abc37 100644 --- a/runtime/cmake/version.cmake +++ b/runtime/cmake/version.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Set up some default version variables. diff --git a/runtime/codert_vm/CMakeLists.txt b/runtime/codert_vm/CMakeLists.txt index ae687473a9f..0b39a85c094 100644 --- a/runtime/codert_vm/CMakeLists.txt +++ b/runtime/codert_vm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/codert_vm/CodertVMHelpers.cpp b/runtime/codert_vm/CodertVMHelpers.cpp index 2f1fa07ca07..3a86e57e0ce 100644 --- a/runtime/codert_vm/CodertVMHelpers.cpp +++ b/runtime/codert_vm/CodertVMHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/codert_vm/arm64nathelp.m4 b/runtime/codert_vm/arm64nathelp.m4 index f68805c5e88..2489797f58e 100644 --- a/runtime/codert_vm/arm64nathelp.m4 +++ b/runtime/codert_vm/arm64nathelp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(arm64helpers.m4) diff --git a/runtime/codert_vm/armnathelp.m4 b/runtime/codert_vm/armnathelp.m4 index 26bf26e5b9c..0c89f385f1a 100644 --- a/runtime/codert_vm/armnathelp.m4 +++ b/runtime/codert_vm/armnathelp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(armhelpers.m4) diff --git a/runtime/codert_vm/cache.c b/runtime/codert_vm/cache.c index 393f5d6c340..92247a41072 100644 --- a/runtime/codert_vm/cache.c +++ b/runtime/codert_vm/cache.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/cache.h b/runtime/codert_vm/cache.h index e19df1fa8e0..51ea75425ee 100644 --- a/runtime/codert_vm/cache.h +++ b/runtime/codert_vm/cache.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef cache_h #define cache_h diff --git a/runtime/codert_vm/cnathelp.cpp b/runtime/codert_vm/cnathelp.cpp index 80db6c92d1b..fba11ceef0e 100644 --- a/runtime/codert_vm/cnathelp.cpp +++ b/runtime/codert_vm/cnathelp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/decomp.cpp b/runtime/codert_vm/decomp.cpp index 048e9ca2e11..bdef6983618 100644 --- a/runtime/codert_vm/decomp.cpp +++ b/runtime/codert_vm/decomp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/codert_vm/dlt.c b/runtime/codert_vm/dlt.c index d81d164ee37..de83cea5583 100644 --- a/runtime/codert_vm/dlt.c +++ b/runtime/codert_vm/dlt.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include "j9.h" diff --git a/runtime/codert_vm/fsdcsup.c b/runtime/codert_vm/fsdcsup.c index d170b3147d7..222a928135a 100644 --- a/runtime/codert_vm/fsdcsup.c +++ b/runtime/codert_vm/fsdcsup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/j9codertvm.tdf b/runtime/codert_vm/j9codertvm.tdf index b828eeeafb8..4bcddb30da9 100644 --- a/runtime/codert_vm/j9codertvm.tdf +++ b/runtime/codert_vm/j9codertvm.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9codertvm diff --git a/runtime/codert_vm/jitavl.c b/runtime/codert_vm/jitavl.c index b51eccb68be..5b701452081 100644 --- a/runtime/codert_vm/jitavl.c +++ b/runtime/codert_vm/jitavl.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/jithash.cpp b/runtime/codert_vm/jithash.cpp index b4e8969385d..061543ffcd9 100644 --- a/runtime/codert_vm/jithash.cpp +++ b/runtime/codert_vm/jithash.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/codert_vm/jithash.h b/runtime/codert_vm/jithash.h index cdab64ee9f2..bb2dc21ba15 100644 --- a/runtime/codert_vm/jithash.h +++ b/runtime/codert_vm/jithash.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/jswalk.c b/runtime/codert_vm/jswalk.c index 34295c9abd9..8ff475eec55 100644 --- a/runtime/codert_vm/jswalk.c +++ b/runtime/codert_vm/jswalk.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/module.xml b/runtime/codert_vm/module.xml index ecf4560f88d..15875a026e1 100644 --- a/runtime/codert_vm/module.xml +++ b/runtime/codert_vm/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/codert_vm/pnathelp.m4 b/runtime/codert_vm/pnathelp.m4 index b21e96c4dac..9adcb7c0fe5 100644 --- a/runtime/codert_vm/pnathelp.m4 +++ b/runtime/codert_vm/pnathelp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(phelpers.m4) diff --git a/runtime/codert_vm/riscvnathelp.m4 b/runtime/codert_vm/riscvnathelp.m4 index 315e255e86b..c9042234d0d 100644 --- a/runtime/codert_vm/riscvnathelp.m4 +++ b/runtime/codert_vm/riscvnathelp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(riscvhelpers.m4) diff --git a/runtime/codert_vm/runtimeInstrumentation.c b/runtime/codert_vm/runtimeInstrumentation.c index 77981ede853..dc06a00fdb8 100644 --- a/runtime/codert_vm/runtimeInstrumentation.c +++ b/runtime/codert_vm/runtimeInstrumentation.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtimeInstrumentation.h" diff --git a/runtime/codert_vm/runtimeInstrumentation.h b/runtime/codert_vm/runtimeInstrumentation.h index 6ab2ec28cba..71e5e7c5ca9 100644 --- a/runtime/codert_vm/runtimeInstrumentation.h +++ b/runtime/codert_vm/runtimeInstrumentation.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef runtimeinstrumentation_h diff --git a/runtime/codert_vm/thunkcrt.c b/runtime/codert_vm/thunkcrt.c index bd8c8c231c1..c3623bbc813 100644 --- a/runtime/codert_vm/thunkcrt.c +++ b/runtime/codert_vm/thunkcrt.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/codert_vm/xnathelp.m4 b/runtime/codert_vm/xnathelp.m4 index 54799ab527d..74c5a415211 100644 --- a/runtime/codert_vm/xnathelp.m4 +++ b/runtime/codert_vm/xnathelp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(xhelpers.m4) diff --git a/runtime/codert_vm/znathelp.m4 b/runtime/codert_vm/znathelp.m4 index e56a8340b49..c4385787bd2 100644 --- a/runtime/codert_vm/znathelp.m4 +++ b/runtime/codert_vm/znathelp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(zhelpers.m4) diff --git a/runtime/compiler/.gitignore b/runtime/compiler/.gitignore index 8a614435210..8167652c4b7 100644 --- a/runtime/compiler/.gitignore +++ b/runtime/compiler/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *.DS_STORE *.DS_Store diff --git a/runtime/compiler/CMakeLists.txt b/runtime/compiler/CMakeLists.txt index 1ef6f141a46..4c652e4bff8 100644 --- a/runtime/compiler/CMakeLists.txt +++ b/runtime/compiler/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ include(CheckCXXCompilerFlag) diff --git a/runtime/compiler/aarch64/CMakeLists.txt b/runtime/compiler/aarch64/CMakeLists.txt index ca414f3aa61..fc84c3dec7e 100644 --- a/runtime/compiler/aarch64/CMakeLists.txt +++ b/runtime/compiler/aarch64/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Manage cross compilation here: diff --git a/runtime/compiler/aarch64/codegen/ARM64AOTRelocation.hpp b/runtime/compiler/aarch64/codegen/ARM64AOTRelocation.hpp index 0389a1b9be7..11b36dc1e85 100644 --- a/runtime/compiler/aarch64/codegen/ARM64AOTRelocation.hpp +++ b/runtime/compiler/aarch64/codegen/ARM64AOTRelocation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64AOTRELOCATION_INCL diff --git a/runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp b/runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp index be0492cc213..8ec958015d8 100644 --- a/runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp +++ b/runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64JNILinkage.hpp" diff --git a/runtime/compiler/aarch64/codegen/ARM64JNILinkage.hpp b/runtime/compiler/aarch64/codegen/ARM64JNILinkage.hpp index ec85f0e5b0a..3538e75a5ca 100644 --- a/runtime/compiler/aarch64/codegen/ARM64JNILinkage.hpp +++ b/runtime/compiler/aarch64/codegen/ARM64JNILinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64_JNILINKAGE_INCL diff --git a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp index c5d52f47485..b8c1d146f3e 100644 --- a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp +++ b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.hpp b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.hpp index f19b01f9933..e949f65268a 100644 --- a/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.hpp +++ b/runtime/compiler/aarch64/codegen/ARM64PrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64_PRIVATELINKAGE_INCL diff --git a/runtime/compiler/aarch64/codegen/ARM64Recompilation.cpp b/runtime/compiler/aarch64/codegen/ARM64Recompilation.cpp index 09b4a613137..cc6dcd3946d 100644 --- a/runtime/compiler/aarch64/codegen/ARM64Recompilation.cpp +++ b/runtime/compiler/aarch64/codegen/ARM64Recompilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64Recompilation.hpp" diff --git a/runtime/compiler/aarch64/codegen/ARM64Recompilation.hpp b/runtime/compiler/aarch64/codegen/ARM64Recompilation.hpp index ae24795db78..26a92a604c9 100644 --- a/runtime/compiler/aarch64/codegen/ARM64Recompilation.hpp +++ b/runtime/compiler/aarch64/codegen/ARM64Recompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64RECOMPILATION_INCL diff --git a/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.cpp b/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.cpp index 78134214eba..250d0212a56 100644 --- a/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.cpp +++ b/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64RecompilationSnippet.hpp" diff --git a/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.hpp b/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.hpp index c6b2664b5ac..ac4551ebfc6 100644 --- a/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.hpp +++ b/runtime/compiler/aarch64/codegen/ARM64RecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64RECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/aarch64/codegen/CMakeLists.txt b/runtime/compiler/aarch64/codegen/CMakeLists.txt index 4d66492247b..0aeaa7246c1 100644 --- a/runtime/compiler/aarch64/codegen/CMakeLists.txt +++ b/runtime/compiler/aarch64/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/aarch64/codegen/CallSnippet.cpp b/runtime/compiler/aarch64/codegen/CallSnippet.cpp index a058683a2f9..e08905c1677 100644 --- a/runtime/compiler/aarch64/codegen/CallSnippet.cpp +++ b/runtime/compiler/aarch64/codegen/CallSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CallSnippet.hpp" diff --git a/runtime/compiler/aarch64/codegen/CallSnippet.hpp b/runtime/compiler/aarch64/codegen/CallSnippet.hpp index cce264658ad..33e3ee96d94 100644 --- a/runtime/compiler/aarch64/codegen/CallSnippet.hpp +++ b/runtime/compiler/aarch64/codegen/CallSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64CALLSNIPPET_INCL diff --git a/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.cpp b/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.cpp index ddfdcca0b7f..a13511f943d 100644 --- a/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.cpp +++ b/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64AOTRelocation.hpp" diff --git a/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.hpp b/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.hpp index 1211b62f956..92db7428471 100644 --- a/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.hpp +++ b/runtime/compiler/aarch64/codegen/ForceRecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64_FORCERECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/aarch64/codegen/Instruction.hpp b/runtime/compiler/aarch64/codegen/Instruction.hpp index c9e700a92c1..43335ef181e 100644 --- a/runtime/compiler/aarch64/codegen/Instruction.hpp +++ b/runtime/compiler/aarch64/codegen/Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRJ9_INSTRUCTION_INCL diff --git a/runtime/compiler/aarch64/codegen/J9ARM64Snippet.cpp b/runtime/compiler/aarch64/codegen/J9ARM64Snippet.cpp index e905a659f86..3a8d0922b4d 100644 --- a/runtime/compiler/aarch64/codegen/J9ARM64Snippet.cpp +++ b/runtime/compiler/aarch64/codegen/J9ARM64Snippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/aarch64/codegen/J9ARM64Snippet.hpp b/runtime/compiler/aarch64/codegen/J9ARM64Snippet.hpp index fa75bbb8134..25cd92e0d99 100644 --- a/runtime/compiler/aarch64/codegen/J9ARM64Snippet.hpp +++ b/runtime/compiler/aarch64/codegen/J9ARM64Snippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ARM64SNIPPET_INCL diff --git a/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.cpp b/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.cpp index 47d487b3c4a..7514aecdedd 100644 --- a/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.cpp +++ b/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.hpp b/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.hpp index 5abb3b080a7..6787abcb076 100644 --- a/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.hpp +++ b/runtime/compiler/aarch64/codegen/J9AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_AHEADOFTIMECOMPILE_INCL diff --git a/runtime/compiler/aarch64/codegen/J9CodeGenerator.cpp b/runtime/compiler/aarch64/codegen/J9CodeGenerator.cpp index 18640073862..e011a7decc7 100644 --- a/runtime/compiler/aarch64/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/aarch64/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp b/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp index 205d0c877f4..408cd583a51 100644 --- a/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/aarch64/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_CODEGENERATOR_INCL diff --git a/runtime/compiler/aarch64/codegen/J9InstructionDelegate.cpp b/runtime/compiler/aarch64/codegen/J9InstructionDelegate.cpp index 267e3122b79..9f9290e9bf0 100644 --- a/runtime/compiler/aarch64/codegen/J9InstructionDelegate.cpp +++ b/runtime/compiler/aarch64/codegen/J9InstructionDelegate.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64Instruction.hpp" diff --git a/runtime/compiler/aarch64/codegen/J9InstructionDelegate.hpp b/runtime/compiler/aarch64/codegen/J9InstructionDelegate.hpp index 5d1db28922d..bb03998db0d 100644 --- a/runtime/compiler/aarch64/codegen/J9InstructionDelegate.hpp +++ b/runtime/compiler/aarch64/codegen/J9InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/aarch64/codegen/J9MemoryReference.cpp b/runtime/compiler/aarch64/codegen/J9MemoryReference.cpp index 7b277cbd545..81d2fc2fdb1 100644 --- a/runtime/compiler/aarch64/codegen/J9MemoryReference.cpp +++ b/runtime/compiler/aarch64/codegen/J9MemoryReference.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64Instruction.hpp" diff --git a/runtime/compiler/aarch64/codegen/J9MemoryReference.hpp b/runtime/compiler/aarch64/codegen/J9MemoryReference.hpp index 312196eed50..61930698c42 100644 --- a/runtime/compiler/aarch64/codegen/J9MemoryReference.hpp +++ b/runtime/compiler/aarch64/codegen/J9MemoryReference.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_MEMORY_REFERENCE_INCL diff --git a/runtime/compiler/aarch64/codegen/J9TreeEvaluator.cpp b/runtime/compiler/aarch64/codegen/J9TreeEvaluator.cpp index 7e8b5e7f447..659c7c00a76 100644 --- a/runtime/compiler/aarch64/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/aarch64/codegen/J9TreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/aarch64/codegen/J9TreeEvaluator.hpp b/runtime/compiler/aarch64/codegen/J9TreeEvaluator.hpp index 135980533aa..c4c1f7dcb60 100644 --- a/runtime/compiler/aarch64/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/aarch64/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.cpp b/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.cpp index 633c66f7287..f8d0627a50c 100644 --- a/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.cpp +++ b/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64Instruction.hpp" diff --git a/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.hpp b/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.hpp index 25743ad73e3..e19c8c570f6 100644 --- a/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.hpp +++ b/runtime/compiler/aarch64/codegen/J9UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_UNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/aarch64/codegen/MemoryReference.hpp b/runtime/compiler/aarch64/codegen/MemoryReference.hpp index ce165d515c7..1d0eb147801 100644 --- a/runtime/compiler/aarch64/codegen/MemoryReference.hpp +++ b/runtime/compiler/aarch64/codegen/MemoryReference.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.cpp b/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.cpp index 2ba138aa6dd..d2288742de5 100644 --- a/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.cpp +++ b/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/StackCheckFailureSnippet.hpp" diff --git a/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.hpp b/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.hpp index 059d304ed1d..6e4215fb15d 100644 --- a/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.hpp +++ b/runtime/compiler/aarch64/codegen/StackCheckFailureSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64STACKCHECKFAILURESNIPPET_INCL diff --git a/runtime/compiler/aarch64/env/CMakeLists.txt b/runtime/compiler/aarch64/env/CMakeLists.txt index 2cc6aa4bc11..11f0e6dcd16 100644 --- a/runtime/compiler/aarch64/env/CMakeLists.txt +++ b/runtime/compiler/aarch64/env/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/aarch64/env/J9CPU.cpp b/runtime/compiler/aarch64/env/J9CPU.cpp index ae6e685421e..c6e8d6ad369 100644 --- a/runtime/compiler/aarch64/env/J9CPU.cpp +++ b/runtime/compiler/aarch64/env/J9CPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/runtime/compiler/aarch64/env/J9CPU.hpp b/runtime/compiler/aarch64/env/J9CPU.hpp index 6781f493d65..442bcd8d1d1 100644 --- a/runtime/compiler/aarch64/env/J9CPU.hpp +++ b/runtime/compiler/aarch64/env/J9CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM64_CPU_INCL diff --git a/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp b/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp index 5685c0fbb2f..06c4c3e6904 100644 --- a/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp +++ b/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/ARM64RelocationTarget.hpp" diff --git a/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.hpp b/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.hpp index 2951b4f1b8f..6a8c5e9b0ef 100644 --- a/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.hpp +++ b/runtime/compiler/aarch64/runtime/ARM64RelocationTarget.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM64RELOCATION_TARGET_INCL diff --git a/runtime/compiler/aarch64/runtime/CMakeLists.txt b/runtime/compiler/aarch64/runtime/CMakeLists.txt index d42b29060ce..80e3b8861d0 100644 --- a/runtime/compiler/aarch64/runtime/CMakeLists.txt +++ b/runtime/compiler/aarch64/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/aarch64/runtime/FlushICache.spp b/runtime/compiler/aarch64/runtime/FlushICache.spp index a1fb61dfb95..8cb716653e3 100644 --- a/runtime/compiler/aarch64/runtime/FlushICache.spp +++ b/runtime/compiler/aarch64/runtime/FlushICache.spp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "aarch64/runtime/arm64asmdefs.inc" diff --git a/runtime/compiler/aarch64/runtime/PicBuilder.spp b/runtime/compiler/aarch64/runtime/PicBuilder.spp index efc1a5f1cc5..605e5f4c027 100644 --- a/runtime/compiler/aarch64/runtime/PicBuilder.spp +++ b/runtime/compiler/aarch64/runtime/PicBuilder.spp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "aarch64/runtime/arm64asmdefs.inc" diff --git a/runtime/compiler/aarch64/runtime/Recomp.cpp b/runtime/compiler/aarch64/runtime/Recomp.cpp index 9b5f3f5b30e..f2911eaf45d 100644 --- a/runtime/compiler/aarch64/runtime/Recomp.cpp +++ b/runtime/compiler/aarch64/runtime/Recomp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARM64ConditionCode.hpp" diff --git a/runtime/compiler/aarch64/runtime/Recompilation.spp b/runtime/compiler/aarch64/runtime/Recompilation.spp index fc107430976..fd337d91037 100644 --- a/runtime/compiler/aarch64/runtime/Recompilation.spp +++ b/runtime/compiler/aarch64/runtime/Recompilation.spp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "aarch64/runtime/arm64asmdefs.inc" diff --git a/runtime/compiler/arm/CMakeLists.txt b/runtime/compiler/arm/CMakeLists.txt index f000735f75d..8c92838bb17 100644 --- a/runtime/compiler/arm/CMakeLists.txt +++ b/runtime/compiler/arm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Manage cross compilation here: diff --git a/runtime/compiler/arm/codegen/ARMAOTRelocation.cpp b/runtime/compiler/arm/codegen/ARMAOTRelocation.cpp index 29f52b4ba2c..f027e4bb390 100644 --- a/runtime/compiler/arm/codegen/ARMAOTRelocation.cpp +++ b/runtime/compiler/arm/codegen/ARMAOTRelocation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //#include "codegen/ARMCodeGenerator.hpp" diff --git a/runtime/compiler/arm/codegen/ARMAOTRelocation.hpp b/runtime/compiler/arm/codegen/ARMAOTRelocation.hpp index 6f62cea9882..4584e0ac64d 100644 --- a/runtime/compiler/arm/codegen/ARMAOTRelocation.hpp +++ b/runtime/compiler/arm/codegen/ARMAOTRelocation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMAOTRELOCATION_INCL diff --git a/runtime/compiler/arm/codegen/ARMHelperCallSnippet.cpp b/runtime/compiler/arm/codegen/ARMHelperCallSnippet.cpp index d53ed5b9433..878e5cab2e9 100644 --- a/runtime/compiler/arm/codegen/ARMHelperCallSnippet.cpp +++ b/runtime/compiler/arm/codegen/ARMHelperCallSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMHelperCallSnippet.hpp" diff --git a/runtime/compiler/arm/codegen/ARMHelperCallSnippet.hpp b/runtime/compiler/arm/codegen/ARMHelperCallSnippet.hpp index c737def96c8..2c5e3934add 100644 --- a/runtime/compiler/arm/codegen/ARMHelperCallSnippet.hpp +++ b/runtime/compiler/arm/codegen/ARMHelperCallSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMHELPERCALLSNIPPET_INCL diff --git a/runtime/compiler/arm/codegen/ARMJNILinkage.cpp b/runtime/compiler/arm/codegen/ARMJNILinkage.cpp index ad23e4e852c..130133766e0 100644 --- a/runtime/compiler/arm/codegen/ARMJNILinkage.cpp +++ b/runtime/compiler/arm/codegen/ARMJNILinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMJNILinkage.hpp" diff --git a/runtime/compiler/arm/codegen/ARMJNILinkage.hpp b/runtime/compiler/arm/codegen/ARMJNILinkage.hpp index cd1cca1cf1d..428bae51151 100644 --- a/runtime/compiler/arm/codegen/ARMJNILinkage.hpp +++ b/runtime/compiler/arm/codegen/ARMJNILinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM_JNILINKAGE_INCL diff --git a/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp b/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp index 4a679422ce6..769238b634d 100644 --- a/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp +++ b/runtime/compiler/arm/codegen/ARMPrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMPrivateLinkage.hpp" diff --git a/runtime/compiler/arm/codegen/ARMPrivateLinkage.hpp b/runtime/compiler/arm/codegen/ARMPrivateLinkage.hpp index 12e1436c351..4110f602fdd 100644 --- a/runtime/compiler/arm/codegen/ARMPrivateLinkage.hpp +++ b/runtime/compiler/arm/codegen/ARMPrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARM_PRIVATELINKAGE_INCL diff --git a/runtime/compiler/arm/codegen/ARMRecompilation.cpp b/runtime/compiler/arm/codegen/ARMRecompilation.cpp index 9ab57e8307d..710b895adc2 100644 --- a/runtime/compiler/arm/codegen/ARMRecompilation.cpp +++ b/runtime/compiler/arm/codegen/ARMRecompilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ARMRecompilation.hpp" diff --git a/runtime/compiler/arm/codegen/ARMRecompilation.hpp b/runtime/compiler/arm/codegen/ARMRecompilation.hpp index f87bf857f41..da89cb7cef5 100644 --- a/runtime/compiler/arm/codegen/ARMRecompilation.hpp +++ b/runtime/compiler/arm/codegen/ARMRecompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMRECOMPILATION_INCL diff --git a/runtime/compiler/arm/codegen/ARMRecompilationSnippet.cpp b/runtime/compiler/arm/codegen/ARMRecompilationSnippet.cpp index e9dcae207ab..c1041856bd9 100644 --- a/runtime/compiler/arm/codegen/ARMRecompilationSnippet.cpp +++ b/runtime/compiler/arm/codegen/ARMRecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/codegen/ARMRecompilationSnippet.hpp" diff --git a/runtime/compiler/arm/codegen/ARMRecompilationSnippet.hpp b/runtime/compiler/arm/codegen/ARMRecompilationSnippet.hpp index 6b80678d964..9baa7c50110 100644 --- a/runtime/compiler/arm/codegen/ARMRecompilationSnippet.hpp +++ b/runtime/compiler/arm/codegen/ARMRecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMRECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/arm/codegen/CallSnippet.cpp b/runtime/compiler/arm/codegen/CallSnippet.cpp index 742c229764f..9282453decb 100644 --- a/runtime/compiler/arm/codegen/CallSnippet.cpp +++ b/runtime/compiler/arm/codegen/CallSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CallSnippet.hpp" diff --git a/runtime/compiler/arm/codegen/CallSnippet.hpp b/runtime/compiler/arm/codegen/CallSnippet.hpp index f11a058af5f..5c92707ee5b 100644 --- a/runtime/compiler/arm/codegen/CallSnippet.hpp +++ b/runtime/compiler/arm/codegen/CallSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMCALLSNIPPET_INCL diff --git a/runtime/compiler/arm/codegen/Instruction.hpp b/runtime/compiler/arm/codegen/Instruction.hpp index 46bff75f5fa..9fb496468ed 100644 --- a/runtime/compiler/arm/codegen/Instruction.hpp +++ b/runtime/compiler/arm/codegen/Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRJ9_INSTRUCTION_INCL diff --git a/runtime/compiler/arm/codegen/J9ARMEvaluator.cpp b/runtime/compiler/arm/codegen/J9ARMEvaluator.cpp index 9c391039527..c4bf8837ff2 100644 --- a/runtime/compiler/arm/codegen/J9ARMEvaluator.cpp +++ b/runtime/compiler/arm/codegen/J9ARMEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/arm/codegen/J9ARMSnippet.cpp b/runtime/compiler/arm/codegen/J9ARMSnippet.cpp index 7a997e2870d..52c1fb90405 100644 --- a/runtime/compiler/arm/codegen/J9ARMSnippet.cpp +++ b/runtime/compiler/arm/codegen/J9ARMSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/arm/codegen/J9ARMSnippet.hpp b/runtime/compiler/arm/codegen/J9ARMSnippet.hpp index 037fd1cc455..f0d4ce04a2b 100644 --- a/runtime/compiler/arm/codegen/J9ARMSnippet.hpp +++ b/runtime/compiler/arm/codegen/J9ARMSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ARMSNIPPET_INCL diff --git a/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.cpp b/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.cpp index 43296d6a616..093bb2dde1c 100644 --- a/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.cpp +++ b/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.hpp b/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.hpp index 3f891eb8115..5fc43a96fde 100644 --- a/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.hpp +++ b/runtime/compiler/arm/codegen/J9AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM_AHEADOFTIMECOMPILE_INCL diff --git a/runtime/compiler/arm/codegen/J9CodeGenerator.cpp b/runtime/compiler/arm/codegen/J9CodeGenerator.cpp index 995a63bf479..dd13fcf9d71 100644 --- a/runtime/compiler/arm/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/arm/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/arm/codegen/J9CodeGenerator.hpp b/runtime/compiler/arm/codegen/J9CodeGenerator.hpp index d4b75c7d46c..b6170d98883 100644 --- a/runtime/compiler/arm/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/arm/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM_CODEGENERATOR_INCL diff --git a/runtime/compiler/arm/codegen/J9InstructionDelegate.hpp b/runtime/compiler/arm/codegen/J9InstructionDelegate.hpp index b07efa5f864..7fa3844bb58 100644 --- a/runtime/compiler/arm/codegen/J9InstructionDelegate.hpp +++ b/runtime/compiler/arm/codegen/J9InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/arm/codegen/J9TreeEvaluator.cpp b/runtime/compiler/arm/codegen/J9TreeEvaluator.cpp index 73a55c5813a..045ab8ef8c0 100644 --- a/runtime/compiler/arm/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/arm/codegen/J9TreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/arm/codegen/J9TreeEvaluator.hpp b/runtime/compiler/arm/codegen/J9TreeEvaluator.hpp index 90c9d45a075..d111dcaae2a 100644 --- a/runtime/compiler/arm/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/arm/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.cpp b/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.cpp index c86945f2381..b96dc2beab9 100644 --- a/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.cpp +++ b/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.hpp b/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.hpp index ac366fbdeed..db513faa1ec 100644 --- a/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.hpp +++ b/runtime/compiler/arm/codegen/J9UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM_UNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/arm/env/J9CPU.cpp b/runtime/compiler/arm/env/J9CPU.cpp index 4de57e0e3f2..97267808b6b 100644 --- a/runtime/compiler/arm/env/J9CPU.cpp +++ b/runtime/compiler/arm/env/J9CPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/runtime/compiler/arm/env/J9CPU.hpp b/runtime/compiler/arm/env/J9CPU.hpp index 2bcb4a1f279..207ac363b24 100644 --- a/runtime/compiler/arm/env/J9CPU.hpp +++ b/runtime/compiler/arm/env/J9CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARM_CPU_INCL diff --git a/runtime/compiler/arm/runtime/ARMRelocationTarget.cpp b/runtime/compiler/arm/runtime/ARMRelocationTarget.cpp index 22805aaaed4..1db190c9643 100644 --- a/runtime/compiler/arm/runtime/ARMRelocationTarget.cpp +++ b/runtime/compiler/arm/runtime/ARMRelocationTarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "arm/runtime/ARMRelocationTarget.hpp" diff --git a/runtime/compiler/arm/runtime/ARMRelocationTarget.hpp b/runtime/compiler/arm/runtime/ARMRelocationTarget.hpp index ea8805605b4..dc6bed4b2e9 100644 --- a/runtime/compiler/arm/runtime/ARMRelocationTarget.hpp +++ b/runtime/compiler/arm/runtime/ARMRelocationTarget.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARMRELOCATION_TARGET_INCL diff --git a/runtime/compiler/arm/runtime/ArrayCopy.armasm b/runtime/compiler/arm/runtime/ArrayCopy.armasm index 21e0f0c106d..2a4ce07c13e 100644 --- a/runtime/compiler/arm/runtime/ArrayCopy.armasm +++ b/runtime/compiler/arm/runtime/ArrayCopy.armasm @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/arm/runtime/Math.armasm b/runtime/compiler/arm/runtime/Math.armasm index 983f5f3ebf6..6fc55e2d0c1 100644 --- a/runtime/compiler/arm/runtime/Math.armasm +++ b/runtime/compiler/arm/runtime/Math.armasm @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ AREA Math_c, CODE, READONLY diff --git a/runtime/compiler/arm/runtime/MathHelp.c b/runtime/compiler/arm/runtime/MathHelp.c index cd4853cf8f6..01fe5224b92 100644 --- a/runtime/compiler/arm/runtime/MathHelp.c +++ b/runtime/compiler/arm/runtime/MathHelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/arm/runtime/PicBuilder.armasm b/runtime/compiler/arm/runtime/PicBuilder.armasm index 90813d85c0b..8ffcd9ff18c 100644 --- a/runtime/compiler/arm/runtime/PicBuilder.armasm +++ b/runtime/compiler/arm/runtime/PicBuilder.armasm @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/arm/runtime/Recomp.cpp b/runtime/compiler/arm/runtime/Recomp.cpp index 2ccdd392b77..306a6433169 100644 --- a/runtime/compiler/arm/runtime/Recomp.cpp +++ b/runtime/compiler/arm/runtime/Recomp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/arm/runtime/Recompilation.armasm b/runtime/compiler/arm/runtime/Recompilation.armasm index 323f2dac2d7..bb5fe27e3e3 100644 --- a/runtime/compiler/arm/runtime/Recompilation.armasm +++ b/runtime/compiler/arm/runtime/Recompilation.armasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #include "j9cfg.h" #include "jilconsts.inc" diff --git a/runtime/compiler/arm/runtime/ThunkHelpersARM.c b/runtime/compiler/arm/runtime/ThunkHelpersARM.c index a9cfc43495f..8d87238b7e3 100644 --- a/runtime/compiler/arm/runtime/ThunkHelpersARM.c +++ b/runtime/compiler/arm/runtime/ThunkHelpersARM.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/build/files/common.mk b/runtime/compiler/build/files/common.mk index e64134d4000..f7c359d79f8 100644 --- a/runtime/compiler/build/files/common.mk +++ b/runtime/compiler/build/files/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ compiler/control/J9Recompilation.cpp \ diff --git a/runtime/compiler/build/files/host/aarch64.mk b/runtime/compiler/build/files/host/aarch64.mk index c6fef273262..d2bac0c77ab 100644 --- a/runtime/compiler/build/files/host/aarch64.mk +++ b/runtime/compiler/build/files/host/aarch64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+= \ omr/compiler/aarch64/runtime/ARM64arrayCopy.spp \ diff --git a/runtime/compiler/build/files/host/amd64.mk b/runtime/compiler/build/files/host/amd64.mk index 0f45fd028af..1590959750e 100644 --- a/runtime/compiler/build/files/host/amd64.mk +++ b/runtime/compiler/build/files/host/amd64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_SOURCE_FILES+=\ compiler/x/amd64/runtime/AMD64CompressString.nasm \ diff --git a/runtime/compiler/build/files/host/arm.mk b/runtime/compiler/build/files/host/arm.mk index caf65c2efaf..7a1184afb65 100644 --- a/runtime/compiler/build/files/host/arm.mk +++ b/runtime/compiler/build/files/host/arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+= \ omr/compiler/arm/runtime/CodeSync.cpp \ diff --git a/runtime/compiler/build/files/host/i386.mk b/runtime/compiler/build/files/host/i386.mk index e3543d15e83..954bbd31621 100644 --- a/runtime/compiler/build/files/host/i386.mk +++ b/runtime/compiler/build/files/host/i386.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_SOURCE_FILES+=\ compiler/x/i386/runtime/IA32Recompilation.nasm \ diff --git a/runtime/compiler/build/files/host/p.mk b/runtime/compiler/build/files/host/p.mk index 80f41938603..bf7afc03fa6 100644 --- a/runtime/compiler/build/files/host/p.mk +++ b/runtime/compiler/build/files/host/p.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+= \ omr/compiler/p/runtime/VirtualGuardRuntime.spp diff --git a/runtime/compiler/build/files/host/x.mk b/runtime/compiler/build/files/host/x.mk index 5add2f2cab9..7a34e1bb5a4 100644 --- a/runtime/compiler/build/files/host/x.mk +++ b/runtime/compiler/build/files/host/x.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+= \ omr/compiler/x/runtime/VirtualGuardRuntime.cpp diff --git a/runtime/compiler/build/files/host/z.mk b/runtime/compiler/build/files/host/z.mk index 78d2d2da893..3374ab8d723 100644 --- a/runtime/compiler/build/files/host/z.mk +++ b/runtime/compiler/build/files/host/z.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+= \ omr/compiler/z/runtime/VirtualGuardRuntime.cpp diff --git a/runtime/compiler/build/files/target/aarch64.mk b/runtime/compiler/build/files/target/aarch64.mk index a97cd902a33..31df2445025 100644 --- a/runtime/compiler/build/files/target/aarch64.mk +++ b/runtime/compiler/build/files/target/aarch64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+= \ omr/compiler/aarch64/codegen/ARM64BinaryEncoding.cpp \ diff --git a/runtime/compiler/build/files/target/amd64.mk b/runtime/compiler/build/files/target/amd64.mk index 360a47a8b62..44c3be98695 100644 --- a/runtime/compiler/build/files/target/amd64.mk +++ b/runtime/compiler/build/files/target/amd64.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ omr/compiler/x/amd64/codegen/AMD64SystemLinkage.cpp \ diff --git a/runtime/compiler/build/files/target/arm.mk b/runtime/compiler/build/files/target/arm.mk index 69d18fbb69c..4a5571cba16 100644 --- a/runtime/compiler/build/files/target/arm.mk +++ b/runtime/compiler/build/files/target/arm.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ omr/compiler/arm/codegen/ARMBinaryEncoding.cpp \ diff --git a/runtime/compiler/build/files/target/i386.mk b/runtime/compiler/build/files/target/i386.mk index 2687ef05f90..545b2e2f705 100644 --- a/runtime/compiler/build/files/target/i386.mk +++ b/runtime/compiler/build/files/target/i386.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ omr/compiler/x/i386/codegen/IA32SystemLinkage.cpp \ diff --git a/runtime/compiler/build/files/target/p.mk b/runtime/compiler/build/files/target/p.mk index 4ac2c5eee28..84dd116e5e2 100644 --- a/runtime/compiler/build/files/target/p.mk +++ b/runtime/compiler/build/files/target/p.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ omr/compiler/p/codegen/BinaryEvaluator.cpp \ diff --git a/runtime/compiler/build/files/target/x.mk b/runtime/compiler/build/files/target/x.mk index e12fcae2362..dcf29761641 100644 --- a/runtime/compiler/build/files/target/x.mk +++ b/runtime/compiler/build/files/target/x.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ omr/compiler/x/codegen/BinaryCommutativeAnalyser.cpp \ diff --git a/runtime/compiler/build/files/target/z.mk b/runtime/compiler/build/files/target/z.mk index db1c60512d5..f09bc4ec895 100644 --- a/runtime/compiler/build/files/target/z.mk +++ b/runtime/compiler/build/files/target/z.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 JIT_PRODUCT_BACKEND_SOURCES+=\ omr/compiler/z/codegen/BinaryAnalyser.cpp \ diff --git a/runtime/compiler/build/platform/common.mk b/runtime/compiler/build/platform/common.mk index 0231b5670d8..4ffebf30cb7 100644 --- a/runtime/compiler/build/platform/common.mk +++ b/runtime/compiler/build/platform/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Common file for setting platform tokens diff --git a/runtime/compiler/build/platform/host/aarch64-linux-gcc.mk b/runtime/compiler/build/platform/host/aarch64-linux-gcc.mk index 7ac26d98406..7dc9c924aa9 100644 --- a/runtime/compiler/build/platform/host/aarch64-linux-gcc.mk +++ b/runtime/compiler/build/platform/host/aarch64-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=aarch64 HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/amd64-linux-gcc.mk b/runtime/compiler/build/platform/host/amd64-linux-gcc.mk index 555b20a240a..ac39a25412b 100644 --- a/runtime/compiler/build/platform/host/amd64-linux-gcc.mk +++ b/runtime/compiler/build/platform/host/amd64-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=x HOST_SUBARCH=i386 diff --git a/runtime/compiler/build/platform/host/amd64-linux64-clang.mk b/runtime/compiler/build/platform/host/amd64-linux64-clang.mk index bfdcf7ba5e8..014dafca451 100644 --- a/runtime/compiler/build/platform/host/amd64-linux64-clang.mk +++ b/runtime/compiler/build/platform/host/amd64-linux64-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=x HOST_SUBARCH=amd64 diff --git a/runtime/compiler/build/platform/host/amd64-linux64-gcc.mk b/runtime/compiler/build/platform/host/amd64-linux64-gcc.mk index 28da2ec7534..adef3f12477 100644 --- a/runtime/compiler/build/platform/host/amd64-linux64-gcc.mk +++ b/runtime/compiler/build/platform/host/amd64-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=x HOST_SUBARCH=amd64 diff --git a/runtime/compiler/build/platform/host/amd64-osx-clang.mk b/runtime/compiler/build/platform/host/amd64-osx-clang.mk index 6518acf1689..5aa603d7963 100644 --- a/runtime/compiler/build/platform/host/amd64-osx-clang.mk +++ b/runtime/compiler/build/platform/host/amd64-osx-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/runtime/compiler/build/platform/host/amd64-osx-gcc.mk b/runtime/compiler/build/platform/host/amd64-osx-gcc.mk index a2ed595aa74..dd80ca3f2f1 100644 --- a/runtime/compiler/build/platform/host/amd64-osx-gcc.mk +++ b/runtime/compiler/build/platform/host/amd64-osx-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_ARCH=x diff --git a/runtime/compiler/build/platform/host/amd64-win64-mvs.mk b/runtime/compiler/build/platform/host/amd64-win64-mvs.mk index c48adfeb4c3..fd409c7b1cf 100644 --- a/runtime/compiler/build/platform/host/amd64-win64-mvs.mk +++ b/runtime/compiler/build/platform/host/amd64-win64-mvs.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=x HOST_SUBARCH=amd64 diff --git a/runtime/compiler/build/platform/host/arm-linux-gcc.mk b/runtime/compiler/build/platform/host/arm-linux-gcc.mk index f568099c561..bae7348229e 100644 --- a/runtime/compiler/build/platform/host/arm-linux-gcc.mk +++ b/runtime/compiler/build/platform/host/arm-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=arm HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ia32-win32-mvs.mk b/runtime/compiler/build/platform/host/ia32-win32-mvs.mk index 5cbfe35be07..3cac5911b0c 100644 --- a/runtime/compiler/build/platform/host/ia32-win32-mvs.mk +++ b/runtime/compiler/build/platform/host/ia32-win32-mvs.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=x HOST_SUBARCH=i386 diff --git a/runtime/compiler/build/platform/host/ppc-aix-vacpp.mk b/runtime/compiler/build/platform/host/ppc-aix-vacpp.mk index 482b609ec26..7740b6ba04f 100644 --- a/runtime/compiler/build/platform/host/ppc-aix-vacpp.mk +++ b/runtime/compiler/build/platform/host/ppc-aix-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc-linux-gcc.mk b/runtime/compiler/build/platform/host/ppc-linux-gcc.mk index a587648f380..c9a75776c5e 100644 --- a/runtime/compiler/build/platform/host/ppc-linux-gcc.mk +++ b/runtime/compiler/build/platform/host/ppc-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc-linux-vacpp.mk b/runtime/compiler/build/platform/host/ppc-linux-vacpp.mk index 45de6c3dc4d..765a31c1b8a 100644 --- a/runtime/compiler/build/platform/host/ppc-linux-vacpp.mk +++ b/runtime/compiler/build/platform/host/ppc-linux-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc64-aix-vacpp.mk b/runtime/compiler/build/platform/host/ppc64-aix-vacpp.mk index 2d1c9378533..605daf7dcd1 100644 --- a/runtime/compiler/build/platform/host/ppc64-aix-vacpp.mk +++ b/runtime/compiler/build/platform/host/ppc64-aix-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc64-linux64-clang.mk b/runtime/compiler/build/platform/host/ppc64-linux64-clang.mk index b3529c69c70..6edd7264e08 100644 --- a/runtime/compiler/build/platform/host/ppc64-linux64-clang.mk +++ b/runtime/compiler/build/platform/host/ppc64-linux64-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc64-linux64-gcc.mk b/runtime/compiler/build/platform/host/ppc64-linux64-gcc.mk index 708f8485e20..090219eb66d 100644 --- a/runtime/compiler/build/platform/host/ppc64-linux64-gcc.mk +++ b/runtime/compiler/build/platform/host/ppc64-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc64-linux64-vacpp.mk b/runtime/compiler/build/platform/host/ppc64-linux64-vacpp.mk index b4984d0803e..b915d15d94e 100644 --- a/runtime/compiler/build/platform/host/ppc64-linux64-vacpp.mk +++ b/runtime/compiler/build/platform/host/ppc64-linux64-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc64le-linux64-gcc.mk b/runtime/compiler/build/platform/host/ppc64le-linux64-gcc.mk index 708f8485e20..090219eb66d 100644 --- a/runtime/compiler/build/platform/host/ppc64le-linux64-gcc.mk +++ b/runtime/compiler/build/platform/host/ppc64le-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/ppc64le-linux64-vacpp.mk b/runtime/compiler/build/platform/host/ppc64le-linux64-vacpp.mk index 7a66af7b71a..8d7b2935348 100644 --- a/runtime/compiler/build/platform/host/ppc64le-linux64-vacpp.mk +++ b/runtime/compiler/build/platform/host/ppc64le-linux64-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=p HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-linux-clang.mk b/runtime/compiler/build/platform/host/s390-linux-clang.mk index 8eb1bf52f8f..6bf05c098eb 100644 --- a/runtime/compiler/build/platform/host/s390-linux-clang.mk +++ b/runtime/compiler/build/platform/host/s390-linux-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-linux-gcc.mk b/runtime/compiler/build/platform/host/s390-linux-gcc.mk index 288f2adb7c7..e8d06b4a1a1 100644 --- a/runtime/compiler/build/platform/host/s390-linux-gcc.mk +++ b/runtime/compiler/build/platform/host/s390-linux-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-linux64-clang.mk b/runtime/compiler/build/platform/host/s390-linux64-clang.mk index b527a965fb0..8cbbf5008b3 100644 --- a/runtime/compiler/build/platform/host/s390-linux64-clang.mk +++ b/runtime/compiler/build/platform/host/s390-linux64-clang.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-linux64-gcc.mk b/runtime/compiler/build/platform/host/s390-linux64-gcc.mk index 0b74111e4e8..11420f11f27 100644 --- a/runtime/compiler/build/platform/host/s390-linux64-gcc.mk +++ b/runtime/compiler/build/platform/host/s390-linux64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-zos-vacpp.mk b/runtime/compiler/build/platform/host/s390-zos-vacpp.mk index 6188903e44e..0830ba0d8f8 100644 --- a/runtime/compiler/build/platform/host/s390-zos-vacpp.mk +++ b/runtime/compiler/build/platform/host/s390-zos-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-zos64-vacpp.mk b/runtime/compiler/build/platform/host/s390-zos64-vacpp.mk index a2887f8289d..480f42245bb 100644 --- a/runtime/compiler/build/platform/host/s390-zos64-vacpp.mk +++ b/runtime/compiler/build/platform/host/s390-zos64-vacpp.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/host/s390-ztpf64-gcc.mk b/runtime/compiler/build/platform/host/s390-ztpf64-gcc.mk index 7f2c88b89fb..bd49cbb1c19 100644 --- a/runtime/compiler/build/platform/host/s390-ztpf64-gcc.mk +++ b/runtime/compiler/build/platform/host/s390-ztpf64-gcc.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_ARCH=z HOST_SUBARCH= diff --git a/runtime/compiler/build/platform/target/all.mk b/runtime/compiler/build/platform/target/all.mk index 995957ee2d9..cdfc8933a78 100644 --- a/runtime/compiler/build/platform/target/all.mk +++ b/runtime/compiler/build/platform/target/all.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # If user didn't pass a target arch, assume same as host diff --git a/runtime/compiler/build/rules/aix-xlc/common.mk b/runtime/compiler/build/rules/aix-xlc/common.mk index 0e36af79a32..40bbd5b07ba 100644 --- a/runtime/compiler/build/rules/aix-xlc/common.mk +++ b/runtime/compiler/build/rules/aix-xlc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Defines rules for compiling source files into object files diff --git a/runtime/compiler/build/rules/aix-xlc/filetypes.mk b/runtime/compiler/build/rules/aix-xlc/filetypes.mk index ae2c677752d..65bfa4c98b2 100644 --- a/runtime/compiler/build/rules/aix-xlc/filetypes.mk +++ b/runtime/compiler/build/rules/aix-xlc/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/rules/common.mk b/runtime/compiler/build/rules/common.mk index 49a983fc251..dbe4fc5d864 100644 --- a/runtime/compiler/build/rules/common.mk +++ b/runtime/compiler/build/rules/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Add our targets to the global targets all: jit diff --git a/runtime/compiler/build/rules/gnu-xlc/common.mk b/runtime/compiler/build/rules/gnu-xlc/common.mk index 97f23a16ec4..da8453aca42 100644 --- a/runtime/compiler/build/rules/gnu-xlc/common.mk +++ b/runtime/compiler/build/rules/gnu-xlc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Defines rules for compiling source files into object files diff --git a/runtime/compiler/build/rules/gnu-xlc/filetypes.mk b/runtime/compiler/build/rules/gnu-xlc/filetypes.mk index 8cb4598d02d..ddbc5b1cea0 100644 --- a/runtime/compiler/build/rules/gnu-xlc/filetypes.mk +++ b/runtime/compiler/build/rules/gnu-xlc/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/rules/gnu/common.mk b/runtime/compiler/build/rules/gnu/common.mk index 95b7f6feb40..82fc9bbba6c 100644 --- a/runtime/compiler/build/rules/gnu/common.mk +++ b/runtime/compiler/build/rules/gnu/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Defines rules for compiling source files into object files diff --git a/runtime/compiler/build/rules/gnu/filetypes.mk b/runtime/compiler/build/rules/gnu/filetypes.mk index 64d15a83dcb..c295caa4b8f 100644 --- a/runtime/compiler/build/rules/gnu/filetypes.mk +++ b/runtime/compiler/build/rules/gnu/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/rules/win-msvc/common.mk b/runtime/compiler/build/rules/win-msvc/common.mk index 9f4c9cbd6db..96c512ffa99 100644 --- a/runtime/compiler/build/rules/win-msvc/common.mk +++ b/runtime/compiler/build/rules/win-msvc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Defines rules for compiling source files into object files diff --git a/runtime/compiler/build/rules/win-msvc/filetypes.mk b/runtime/compiler/build/rules/win-msvc/filetypes.mk index 3e489580bd9..e48c8c6a020 100644 --- a/runtime/compiler/build/rules/win-msvc/filetypes.mk +++ b/runtime/compiler/build/rules/win-msvc/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/rules/win-msvc/helper_macro.mk b/runtime/compiler/build/rules/win-msvc/helper_macro.mk index 96728a0ab66..3d29b7cd31a 100644 --- a/runtime/compiler/build/rules/win-msvc/helper_macro.mk +++ b/runtime/compiler/build/rules/win-msvc/helper_macro.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Helper Macro because cmd.exe has such a tiny size for its maximum command line diff --git a/runtime/compiler/build/rules/zos-xlc/common.mk b/runtime/compiler/build/rules/zos-xlc/common.mk index e65ec10d548..12e39c0a4b7 100644 --- a/runtime/compiler/build/rules/zos-xlc/common.mk +++ b/runtime/compiler/build/rules/zos-xlc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Defines rules for compiling source files into object files diff --git a/runtime/compiler/build/rules/zos-xlc/filetypes.mk b/runtime/compiler/build/rules/zos-xlc/filetypes.mk index b4aa60be778..639fd3c69f7 100644 --- a/runtime/compiler/build/rules/zos-xlc/filetypes.mk +++ b/runtime/compiler/build/rules/zos-xlc/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/rules/ztpf-gcc/common.mk b/runtime/compiler/build/rules/ztpf-gcc/common.mk index b906976b8da..b0d1ee035e3 100644 --- a/runtime/compiler/build/rules/ztpf-gcc/common.mk +++ b/runtime/compiler/build/rules/ztpf-gcc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Defines rules for compiling source files into object files # diff --git a/runtime/compiler/build/rules/ztpf-gcc/filetypes.mk b/runtime/compiler/build/rules/ztpf-gcc/filetypes.mk index a8e9dcfda12..d6ed1e4028c 100644 --- a/runtime/compiler/build/rules/ztpf-gcc/filetypes.mk +++ b/runtime/compiler/build/rules/ztpf-gcc/filetypes.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/scripts/armasm2gas.sed b/runtime/compiler/build/scripts/armasm2gas.sed index a2a6b44f41e..22c27436a4c 100644 --- a/runtime/compiler/build/scripts/armasm2gas.sed +++ b/runtime/compiler/build/scripts/armasm2gas.sed @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Do comments first since they can appear anywhere s/;/@/g diff --git a/runtime/compiler/build/scripts/guess-platform.sh b/runtime/compiler/build/scripts/guess-platform.sh index d69bb89be90..6d2b77beed6 100644 --- a/runtime/compiler/build/scripts/guess-platform.sh +++ b/runtime/compiler/build/scripts/guess-platform.sh @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 thirty_two_bit=0 diff --git a/runtime/compiler/build/scripts/j9jit.def b/runtime/compiler/build/scripts/j9jit.def index d3f30fd6417..98e3e78aea8 100644 --- a/runtime/compiler/build/scripts/j9jit.def +++ b/runtime/compiler/build/scripts/j9jit.def @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; LIBRARY J9JIT29 diff --git a/runtime/compiler/build/scripts/j9jit.rc b/runtime/compiler/build/scripts/j9jit.rc index ef38e1811c8..ef03eb34b30 100644 --- a/runtime/compiler/build/scripts/j9jit.rc +++ b/runtime/compiler/build/scripts/j9jit.rc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 */ #include diff --git a/runtime/compiler/build/scripts/s390m4check.pl b/runtime/compiler/build/scripts/s390m4check.pl index e186e5af62e..3c9fd573ac3 100644 --- a/runtime/compiler/build/scripts/s390m4check.pl +++ b/runtime/compiler/build/scripts/s390m4check.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 use warnings; use strict; diff --git a/runtime/compiler/build/toolcfg/aix-xlc/common.mk b/runtime/compiler/build/toolcfg/aix-xlc/common.mk index a26ed6644ad..ce4b58356da 100644 --- a/runtime/compiler/build/toolcfg/aix-xlc/common.mk +++ b/runtime/compiler/build/toolcfg/aix-xlc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Explicitly set shell diff --git a/runtime/compiler/build/toolcfg/common.mk b/runtime/compiler/build/toolcfg/common.mk index 8d02c2ee877..5f7fa1d90e2 100644 --- a/runtime/compiler/build/toolcfg/common.mk +++ b/runtime/compiler/build/toolcfg/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 J9_VERSION?=29 J9LIBS = j9jit_vm j9codert_vm j9util j9utilcore j9pool j9avl j9stackmap j9hashtable diff --git a/runtime/compiler/build/toolcfg/gnu-xlc/common.mk b/runtime/compiler/build/toolcfg/gnu-xlc/common.mk index 590e065031d..97803085922 100644 --- a/runtime/compiler/build/toolcfg/gnu-xlc/common.mk +++ b/runtime/compiler/build/toolcfg/gnu-xlc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Explicitly set shell diff --git a/runtime/compiler/build/toolcfg/gnu/common.mk b/runtime/compiler/build/toolcfg/gnu/common.mk index b19ea8ed3ee..4131740055e 100644 --- a/runtime/compiler/build/toolcfg/gnu/common.mk +++ b/runtime/compiler/build/toolcfg/gnu/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Explicitly set shell diff --git a/runtime/compiler/build/toolcfg/host/32.mk b/runtime/compiler/build/toolcfg/host/32.mk index 3e5f92d0afc..2b77ec97fb9 100644 --- a/runtime/compiler/build/toolcfg/host/32.mk +++ b/runtime/compiler/build/toolcfg/host/32.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_32BIT diff --git a/runtime/compiler/build/toolcfg/host/64.mk b/runtime/compiler/build/toolcfg/host/64.mk index 5934e7097bf..ef12ad6aa2b 100644 --- a/runtime/compiler/build/toolcfg/host/64.mk +++ b/runtime/compiler/build/toolcfg/host/64.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_64BIT BITVECTOR_64BIT diff --git a/runtime/compiler/build/toolcfg/host/aarch64.mk b/runtime/compiler/build/toolcfg/host/aarch64.mk index c4d79a252b0..e06a02ac947 100644 --- a/runtime/compiler/build/toolcfg/host/aarch64.mk +++ b/runtime/compiler/build/toolcfg/host/aarch64.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_ARM64 diff --git a/runtime/compiler/build/toolcfg/host/aix.mk b/runtime/compiler/build/toolcfg/host/aix.mk index 1aab090e89e..2c3114ef199 100644 --- a/runtime/compiler/build/toolcfg/host/aix.mk +++ b/runtime/compiler/build/toolcfg/host/aix.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=AIX diff --git a/runtime/compiler/build/toolcfg/host/arm.mk b/runtime/compiler/build/toolcfg/host/arm.mk index 7e478d5506c..47244007ca1 100644 --- a/runtime/compiler/build/toolcfg/host/arm.mk +++ b/runtime/compiler/build/toolcfg/host/arm.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_ARM diff --git a/runtime/compiler/build/toolcfg/host/linux.mk b/runtime/compiler/build/toolcfg/host/linux.mk index 4d3fb84af9d..784c5a3faf1 100644 --- a/runtime/compiler/build/toolcfg/host/linux.mk +++ b/runtime/compiler/build/toolcfg/host/linux.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=LINUX diff --git a/runtime/compiler/build/toolcfg/host/osx.mk b/runtime/compiler/build/toolcfg/host/osx.mk index e63ad9dda42..340d3c9d686 100644 --- a/runtime/compiler/build/toolcfg/host/osx.mk +++ b/runtime/compiler/build/toolcfg/host/osx.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### HOST_DEFINES+=OSX diff --git a/runtime/compiler/build/toolcfg/host/p.mk b/runtime/compiler/build/toolcfg/host/p.mk index 507e115aa13..e23d2a3d4c7 100644 --- a/runtime/compiler/build/toolcfg/host/p.mk +++ b/runtime/compiler/build/toolcfg/host/p.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_POWER diff --git a/runtime/compiler/build/toolcfg/host/win.mk b/runtime/compiler/build/toolcfg/host/win.mk index 7beb8ea2a64..2ddb0921b6a 100644 --- a/runtime/compiler/build/toolcfg/host/win.mk +++ b/runtime/compiler/build/toolcfg/host/win.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=WINDOWS OMR_OS_WINDOWS diff --git a/runtime/compiler/build/toolcfg/host/x.mk b/runtime/compiler/build/toolcfg/host/x.mk index 0cd5b5b2420..b9adc1c6368 100644 --- a/runtime/compiler/build/toolcfg/host/x.mk +++ b/runtime/compiler/build/toolcfg/host/x.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_X86 diff --git a/runtime/compiler/build/toolcfg/host/z.mk b/runtime/compiler/build/toolcfg/host/z.mk index 99ead3043e0..77c87f16124 100644 --- a/runtime/compiler/build/toolcfg/host/z.mk +++ b/runtime/compiler/build/toolcfg/host/z.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=TR_HOST_S390 diff --git a/runtime/compiler/build/toolcfg/host/zos.mk b/runtime/compiler/build/toolcfg/host/zos.mk index 4a1a304449d..ce2063d6427 100644 --- a/runtime/compiler/build/toolcfg/host/zos.mk +++ b/runtime/compiler/build/toolcfg/host/zos.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 HOST_DEFINES+=ZOS diff --git a/runtime/compiler/build/toolcfg/host/ztpf.mk b/runtime/compiler/build/toolcfg/host/ztpf.mk index a4a385afd0f..e5c0a7f232e 100644 --- a/runtime/compiler/build/toolcfg/host/ztpf.mk +++ b/runtime/compiler/build/toolcfg/host/ztpf.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # These are the rules to compile files of type ".x" into object files diff --git a/runtime/compiler/build/toolcfg/target/32.mk b/runtime/compiler/build/toolcfg/target/32.mk index a1fed01194f..64e3027158d 100644 --- a/runtime/compiler/build/toolcfg/target/32.mk +++ b/runtime/compiler/build/toolcfg/target/32.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_32BIT diff --git a/runtime/compiler/build/toolcfg/target/64.mk b/runtime/compiler/build/toolcfg/target/64.mk index 855563ed92c..26d9c61faff 100644 --- a/runtime/compiler/build/toolcfg/target/64.mk +++ b/runtime/compiler/build/toolcfg/target/64.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_64BIT diff --git a/runtime/compiler/build/toolcfg/target/aarch64.mk b/runtime/compiler/build/toolcfg/target/aarch64.mk index e92408e8dcc..1428b4d570d 100644 --- a/runtime/compiler/build/toolcfg/target/aarch64.mk +++ b/runtime/compiler/build/toolcfg/target/aarch64.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_ARM64 diff --git a/runtime/compiler/build/toolcfg/target/arm.mk b/runtime/compiler/build/toolcfg/target/arm.mk index d7d53001dac..ac52bdb04f7 100644 --- a/runtime/compiler/build/toolcfg/target/arm.mk +++ b/runtime/compiler/build/toolcfg/target/arm.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_ARM diff --git a/runtime/compiler/build/toolcfg/target/p.mk b/runtime/compiler/build/toolcfg/target/p.mk index 997d8490b64..1350e4725ec 100644 --- a/runtime/compiler/build/toolcfg/target/p.mk +++ b/runtime/compiler/build/toolcfg/target/p.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_POWER diff --git a/runtime/compiler/build/toolcfg/target/x.mk b/runtime/compiler/build/toolcfg/target/x.mk index aae7ea6cb7c..09eba93072a 100644 --- a/runtime/compiler/build/toolcfg/target/x.mk +++ b/runtime/compiler/build/toolcfg/target/x.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_X86 diff --git a/runtime/compiler/build/toolcfg/target/z.mk b/runtime/compiler/build/toolcfg/target/z.mk index 35ffd686f16..b132e624342 100644 --- a/runtime/compiler/build/toolcfg/target/z.mk +++ b/runtime/compiler/build/toolcfg/target/z.mk @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TARGET_DEFINES+=TR_TARGET_S390 diff --git a/runtime/compiler/build/toolcfg/win-msvc/common.mk b/runtime/compiler/build/toolcfg/win-msvc/common.mk index 93a0afa7c55..48c735a6820 100644 --- a/runtime/compiler/build/toolcfg/win-msvc/common.mk +++ b/runtime/compiler/build/toolcfg/win-msvc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Explicitly set shell diff --git a/runtime/compiler/build/toolcfg/zos-xlc/common.mk b/runtime/compiler/build/toolcfg/zos-xlc/common.mk index 88ce84d386e..d86e51c7658 100644 --- a/runtime/compiler/build/toolcfg/zos-xlc/common.mk +++ b/runtime/compiler/build/toolcfg/zos-xlc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Explicitly set shell diff --git a/runtime/compiler/build/toolcfg/ztpf-gcc/common.mk b/runtime/compiler/build/toolcfg/ztpf-gcc/common.mk index 8024b7481c8..d226f7d4a89 100644 --- a/runtime/compiler/build/toolcfg/ztpf-gcc/common.mk +++ b/runtime/compiler/build/toolcfg/ztpf-gcc/common.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Explicitly set shell # diff --git a/runtime/compiler/codegen/AheadOfTimeCompile.hpp b/runtime/compiler/codegen/AheadOfTimeCompile.hpp index 9510b8a6449..a717392146b 100644 --- a/runtime/compiler/codegen/AheadOfTimeCompile.hpp +++ b/runtime/compiler/codegen/AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_AHEADOFTIMECOMPILE_INCL diff --git a/runtime/compiler/codegen/CMakeLists.txt b/runtime/compiler/codegen/CMakeLists.txt index f244415f0fa..57c25bf2ee4 100644 --- a/runtime/compiler/codegen/CMakeLists.txt +++ b/runtime/compiler/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/codegen/CodeGenGC.cpp b/runtime/compiler/codegen/CodeGenGC.cpp index 88ae888aac0..17ada5abfa8 100644 --- a/runtime/compiler/codegen/CodeGenGC.cpp +++ b/runtime/compiler/codegen/CodeGenGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/codegen/CodeGenGPU.cpp b/runtime/compiler/codegen/CodeGenGPU.cpp index 540317c783a..6d1dfb8dec8 100644 --- a/runtime/compiler/codegen/CodeGenGPU.cpp +++ b/runtime/compiler/codegen/CodeGenGPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/compiler/codegen/CodeGenPhase.hpp b/runtime/compiler/codegen/CodeGenPhase.hpp index 31b3651ba22..39f1fbe17b5 100644 --- a/runtime/compiler/codegen/CodeGenPhase.hpp +++ b/runtime/compiler/codegen/CodeGenPhase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODEGENPHASE_INCL diff --git a/runtime/compiler/codegen/CodeGenPhaseEnum.hpp b/runtime/compiler/codegen/CodeGenPhaseEnum.hpp index d4722b61bfa..4833aae3166 100644 --- a/runtime/compiler/codegen/CodeGenPhaseEnum.hpp +++ b/runtime/compiler/codegen/CodeGenPhaseEnum.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // This file contains the most specialized version of the CodeGen Phase diff --git a/runtime/compiler/codegen/CodeGenPhaseFunctionTable.hpp b/runtime/compiler/codegen/CodeGenPhaseFunctionTable.hpp index d8f8c0b1641..760e6de534b 100644 --- a/runtime/compiler/codegen/CodeGenPhaseFunctionTable.hpp +++ b/runtime/compiler/codegen/CodeGenPhaseFunctionTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // This file contains the most specialized version of the CodeGen Phase diff --git a/runtime/compiler/codegen/CodeGenPhaseToPerform.hpp b/runtime/compiler/codegen/CodeGenPhaseToPerform.hpp index b3b1a3542c4..68dd5b67720 100644 --- a/runtime/compiler/codegen/CodeGenPhaseToPerform.hpp +++ b/runtime/compiler/codegen/CodeGenPhaseToPerform.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/codegen/CodeGenRA.cpp b/runtime/compiler/codegen/CodeGenRA.cpp index 9995c073a86..af8e135b4cc 100644 --- a/runtime/compiler/codegen/CodeGenRA.cpp +++ b/runtime/compiler/codegen/CodeGenRA.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/codegen/CodeGenerator.hpp b/runtime/compiler/codegen/CodeGenerator.hpp index e2caa888b98..0a19b73bed2 100644 --- a/runtime/compiler/codegen/CodeGenerator.hpp +++ b/runtime/compiler/codegen/CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODEGENERATOR_INCL diff --git a/runtime/compiler/codegen/CodeGenerator_inlines.hpp b/runtime/compiler/codegen/CodeGenerator_inlines.hpp index abeb0805e63..3cfde54a4b6 100644 --- a/runtime/compiler/codegen/CodeGenerator_inlines.hpp +++ b/runtime/compiler/codegen/CodeGenerator_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODEGENERATOR_INLINES_INCL diff --git a/runtime/compiler/codegen/GCStackAtlas.hpp b/runtime/compiler/codegen/GCStackAtlas.hpp index 198cfc2ba61..886b8fa351e 100644 --- a/runtime/compiler/codegen/GCStackAtlas.hpp +++ b/runtime/compiler/codegen/GCStackAtlas.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_GCSTACKATLAS_INCL diff --git a/runtime/compiler/codegen/InstructionDelegate.hpp b/runtime/compiler/codegen/InstructionDelegate.hpp index e066e6a36fd..5b07ff12947 100644 --- a/runtime/compiler/codegen/InstructionDelegate.hpp +++ b/runtime/compiler/codegen/InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/codegen/Instruction_inlines.hpp b/runtime/compiler/codegen/Instruction_inlines.hpp index 2fd03aadce8..f857f61b02e 100644 --- a/runtime/compiler/codegen/Instruction_inlines.hpp +++ b/runtime/compiler/codegen/Instruction_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INSTRUCTION_INLINES_INCL diff --git a/runtime/compiler/codegen/J9AheadOfTimeCompile.cpp b/runtime/compiler/codegen/J9AheadOfTimeCompile.cpp index 8787446b01b..ad3dc40675a 100644 --- a/runtime/compiler/codegen/J9AheadOfTimeCompile.cpp +++ b/runtime/compiler/codegen/J9AheadOfTimeCompile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/runtime/compiler/codegen/J9AheadOfTimeCompile.hpp b/runtime/compiler/codegen/J9AheadOfTimeCompile.hpp index 2c3feaa3477..d1e79691871 100644 --- a/runtime/compiler/codegen/J9AheadOfTimeCompile.hpp +++ b/runtime/compiler/codegen/J9AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_AHEADOFTIMECOMPILE_HPP diff --git a/runtime/compiler/codegen/J9CodeGenPhase.cpp b/runtime/compiler/codegen/J9CodeGenPhase.cpp index 9cb0efaeff5..8d2fad01c0e 100644 --- a/runtime/compiler/codegen/J9CodeGenPhase.cpp +++ b/runtime/compiler/codegen/J9CodeGenPhase.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/codegen/J9CodeGenPhase.hpp b/runtime/compiler/codegen/J9CodeGenPhase.hpp index 096d0034cc0..4ba3b179da4 100644 --- a/runtime/compiler/codegen/J9CodeGenPhase.hpp +++ b/runtime/compiler/codegen/J9CodeGenPhase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CODEGEN_PHASE diff --git a/runtime/compiler/codegen/J9CodeGenPhaseEnum.hpp b/runtime/compiler/codegen/J9CodeGenPhaseEnum.hpp index 23a55d88e7c..f888b203645 100644 --- a/runtime/compiler/codegen/J9CodeGenPhaseEnum.hpp +++ b/runtime/compiler/codegen/J9CodeGenPhaseEnum.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/codegen/J9CodeGenPhaseFunctionTable.hpp b/runtime/compiler/codegen/J9CodeGenPhaseFunctionTable.hpp index 92e751fd54c..3ddb56044c5 100644 --- a/runtime/compiler/codegen/J9CodeGenPhaseFunctionTable.hpp +++ b/runtime/compiler/codegen/J9CodeGenPhaseFunctionTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/codegen/J9CodeGenerator.cpp b/runtime/compiler/codegen/J9CodeGenerator.cpp index 25438ac8e4a..e3533ca8e81 100644 --- a/runtime/compiler/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/codegen/J9CodeGenerator.hpp b/runtime/compiler/codegen/J9CodeGenerator.hpp index ae6ec72def1..6d3b5755396 100644 --- a/runtime/compiler/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CODEGENERATOR_INCL diff --git a/runtime/compiler/codegen/J9CodeGenerator_inlines.hpp b/runtime/compiler/codegen/J9CodeGenerator_inlines.hpp index 2721ca7117c..9d26b18c4e5 100644 --- a/runtime/compiler/codegen/J9CodeGenerator_inlines.hpp +++ b/runtime/compiler/codegen/J9CodeGenerator_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CODEGENERATOR_INLINES_INCL diff --git a/runtime/compiler/codegen/J9GCStackAtlas.cpp b/runtime/compiler/codegen/J9GCStackAtlas.cpp index 16fdd54d82a..20b501044a1 100644 --- a/runtime/compiler/codegen/J9GCStackAtlas.cpp +++ b/runtime/compiler/codegen/J9GCStackAtlas.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/codegen/J9GCStackAtlas.hpp b/runtime/compiler/codegen/J9GCStackAtlas.hpp index 20c359bf018..e77f34e51fa 100644 --- a/runtime/compiler/codegen/J9GCStackAtlas.hpp +++ b/runtime/compiler/codegen/J9GCStackAtlas.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_GCSTACKATLAS_INCL diff --git a/runtime/compiler/codegen/J9Instruction.cpp b/runtime/compiler/codegen/J9Instruction.cpp index b8139bffc6e..2775cab30f2 100644 --- a/runtime/compiler/codegen/J9Instruction.cpp +++ b/runtime/compiler/codegen/J9Instruction.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/codegen/J9Instruction.hpp b/runtime/compiler/codegen/J9Instruction.hpp index a1d5e6aa8ce..7ac4b3f926a 100644 --- a/runtime/compiler/codegen/J9Instruction.hpp +++ b/runtime/compiler/codegen/J9Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_INSTRUCTIONBASE_INCL diff --git a/runtime/compiler/codegen/J9InstructionDelegate.hpp b/runtime/compiler/codegen/J9InstructionDelegate.hpp index d64c087a254..0147be8d3cd 100644 --- a/runtime/compiler/codegen/J9InstructionDelegate.hpp +++ b/runtime/compiler/codegen/J9InstructionDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/codegen/J9Instruction_inlines.hpp b/runtime/compiler/codegen/J9Instruction_inlines.hpp index 2f80b5b93fd..b6cceb9116c 100644 --- a/runtime/compiler/codegen/J9Instruction_inlines.hpp +++ b/runtime/compiler/codegen/J9Instruction_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_INSTRUCTION_INLINES_INCL diff --git a/runtime/compiler/codegen/J9Machine_inlines.hpp b/runtime/compiler/codegen/J9Machine_inlines.hpp index 4d702a4b6cb..f5e03d1e993 100644 --- a/runtime/compiler/codegen/J9Machine_inlines.hpp +++ b/runtime/compiler/codegen/J9Machine_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_MACHINE_INLINES_INCL diff --git a/runtime/compiler/codegen/J9RecognizedMethodsEnum.hpp b/runtime/compiler/codegen/J9RecognizedMethodsEnum.hpp index ad6dc4a6b9c..e251606f610 100644 --- a/runtime/compiler/codegen/J9RecognizedMethodsEnum.hpp +++ b/runtime/compiler/codegen/J9RecognizedMethodsEnum.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_RECOGNIZEDMETHODS_ENUM_INCL diff --git a/runtime/compiler/codegen/J9Snippet.cpp b/runtime/compiler/codegen/J9Snippet.cpp index 333b7d98fb4..74754feea26 100644 --- a/runtime/compiler/codegen/J9Snippet.cpp +++ b/runtime/compiler/codegen/J9Snippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/runtime/compiler/codegen/J9Snippet.hpp b/runtime/compiler/codegen/J9Snippet.hpp index 16cbd738312..174cda46073 100644 --- a/runtime/compiler/codegen/J9Snippet.hpp +++ b/runtime/compiler/codegen/J9Snippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SNIPPET_INCL diff --git a/runtime/compiler/codegen/J9TreeEvaluator.cpp b/runtime/compiler/codegen/J9TreeEvaluator.cpp index 801648e82b5..259b4f2a672 100644 --- a/runtime/compiler/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/codegen/J9TreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/TreeEvaluator.hpp" diff --git a/runtime/compiler/codegen/J9TreeEvaluator.hpp b/runtime/compiler/codegen/J9TreeEvaluator.hpp index ce467306b02..8d30eef2890 100644 --- a/runtime/compiler/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/codegen/J9UnresolvedDataSnippet.hpp b/runtime/compiler/codegen/J9UnresolvedDataSnippet.hpp index 7de789a745e..e3e9ed47944 100644 --- a/runtime/compiler/codegen/J9UnresolvedDataSnippet.hpp +++ b/runtime/compiler/codegen/J9UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_UNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.cpp b/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.cpp index bc3188a1111..e5ddaebb3ff 100644 --- a/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.cpp +++ b/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/J9WatchedInstanceFieldSnippet.hpp" diff --git a/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.hpp b/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.hpp index 5526a66c189..e59e31521ac 100644 --- a/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.hpp +++ b/runtime/compiler/codegen/J9WatchedInstanceFieldSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9WATCHEDINSTANCEFIELDSNIPPET_INCL diff --git a/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.cpp b/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.cpp index d7eb3f46603..7b150c29d52 100644 --- a/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.cpp +++ b/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/J9WatchedStaticFieldSnippet.hpp" diff --git a/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.hpp b/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.hpp index 503018f37be..96c3f3a42b1 100644 --- a/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.hpp +++ b/runtime/compiler/codegen/J9WatchedStaticFieldSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9WATCHEDSTATICFIELDSNIPPET_INCL diff --git a/runtime/compiler/codegen/LinkageConventions.enum b/runtime/compiler/codegen/LinkageConventions.enum index 6f16abff35e..037d76b5021 100644 --- a/runtime/compiler/codegen/LinkageConventions.enum +++ b/runtime/compiler/codegen/LinkageConventions.enum @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/codegen/Machine_inlines.hpp b/runtime/compiler/codegen/Machine_inlines.hpp index 016290b9fe6..26fbcd8a21f 100644 --- a/runtime/compiler/codegen/Machine_inlines.hpp +++ b/runtime/compiler/codegen/Machine_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MACHINE_INLINES_INCL diff --git a/runtime/compiler/codegen/MonitorState.cpp b/runtime/compiler/codegen/MonitorState.cpp index 6c5e3ad351b..d49171011e0 100644 --- a/runtime/compiler/codegen/MonitorState.cpp +++ b/runtime/compiler/codegen/MonitorState.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/codegen/MonitorState.hpp b/runtime/compiler/codegen/MonitorState.hpp index 348fa3e2a3b..762c70759e5 100644 --- a/runtime/compiler/codegen/MonitorState.hpp +++ b/runtime/compiler/codegen/MonitorState.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/codegen/PicHelpers.hpp b/runtime/compiler/codegen/PicHelpers.hpp index a7dfcf57abb..33a1c061bae 100644 --- a/runtime/compiler/codegen/PicHelpers.hpp +++ b/runtime/compiler/codegen/PicHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PICHELPERS_HPP diff --git a/runtime/compiler/codegen/PreprologueConst.hpp b/runtime/compiler/codegen/PreprologueConst.hpp index 01002cc65dd..a156ed9adc8 100644 --- a/runtime/compiler/codegen/PreprologueConst.hpp +++ b/runtime/compiler/codegen/PreprologueConst.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(TR_HOST_X86) diff --git a/runtime/compiler/codegen/PrivateLinkage.cpp b/runtime/compiler/codegen/PrivateLinkage.cpp index 6fa184c38a1..afa9ef086e8 100644 --- a/runtime/compiler/codegen/PrivateLinkage.cpp +++ b/runtime/compiler/codegen/PrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/PrivateLinkage.hpp" diff --git a/runtime/compiler/codegen/PrivateLinkage.hpp b/runtime/compiler/codegen/PrivateLinkage.hpp index dbcc7394654..9c166b351d6 100644 --- a/runtime/compiler/codegen/PrivateLinkage.hpp +++ b/runtime/compiler/codegen/PrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PRIVATELINKAGE_INCL diff --git a/runtime/compiler/codegen/RecognizedMethods.hpp b/runtime/compiler/codegen/RecognizedMethods.hpp index 466c2cc6c03..d8fdd5b37c0 100644 --- a/runtime/compiler/codegen/RecognizedMethods.hpp +++ b/runtime/compiler/codegen/RecognizedMethods.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RECOGNIZEDMETHODS_INCL diff --git a/runtime/compiler/codegen/Snippet.hpp b/runtime/compiler/codegen/Snippet.hpp index eb9f57b968c..628c3ed0704 100644 --- a/runtime/compiler/codegen/Snippet.hpp +++ b/runtime/compiler/codegen/Snippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SNIPPET_INCL diff --git a/runtime/compiler/codegen/TreeEvaluator.hpp b/runtime/compiler/codegen/TreeEvaluator.hpp index fbaefb76cbc..7ec407492d2 100644 --- a/runtime/compiler/codegen/TreeEvaluator.hpp +++ b/runtime/compiler/codegen/TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_J9_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/codegen/UnresolvedDataSnippet.hpp b/runtime/compiler/codegen/UnresolvedDataSnippet.hpp index bf8cbd1190f..09b3b0152f6 100644 --- a/runtime/compiler/codegen/UnresolvedDataSnippet.hpp +++ b/runtime/compiler/codegen/UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_UNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/compile/AOTClassInfo.hpp b/runtime/compiler/compile/AOTClassInfo.hpp index f6cf9821ecd..60f660b80b4 100644 --- a/runtime/compiler/compile/AOTClassInfo.hpp +++ b/runtime/compiler/compile/AOTClassInfo.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_AOTCLASSINFO_INCL diff --git a/runtime/compiler/compile/AliasBuilder.hpp b/runtime/compiler/compile/AliasBuilder.hpp index bf08238457b..46754b56973 100644 --- a/runtime/compiler/compile/AliasBuilder.hpp +++ b/runtime/compiler/compile/AliasBuilder.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ALIASBUILDER_INCL diff --git a/runtime/compiler/compile/CMakeLists.txt b/runtime/compiler/compile/CMakeLists.txt index 4f62aa9b6a3..9b995845df2 100644 --- a/runtime/compiler/compile/CMakeLists.txt +++ b/runtime/compiler/compile/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/compile/Compilation.hpp b/runtime/compiler/compile/Compilation.hpp index fc5ce940ab8..0bca7c927fe 100644 --- a/runtime/compiler/compile/Compilation.hpp +++ b/runtime/compiler/compile/Compilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILATION_INCL diff --git a/runtime/compiler/compile/Compilation_inlines.hpp b/runtime/compiler/compile/Compilation_inlines.hpp index 8b356fb5469..381af782ab3 100644 --- a/runtime/compiler/compile/Compilation_inlines.hpp +++ b/runtime/compiler/compile/Compilation_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATION_INLINES_INCL diff --git a/runtime/compiler/compile/J9AliasBuilder.cpp b/runtime/compiler/compile/J9AliasBuilder.cpp index 58f7c75d0dd..2f1c5f09ee5 100644 --- a/runtime/compiler/compile/J9AliasBuilder.cpp +++ b/runtime/compiler/compile/J9AliasBuilder.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/AliasBuilder.hpp" diff --git a/runtime/compiler/compile/J9AliasBuilder.hpp b/runtime/compiler/compile/J9AliasBuilder.hpp index 5b8d97e8981..9ca2bfa8f3e 100644 --- a/runtime/compiler/compile/J9AliasBuilder.hpp +++ b/runtime/compiler/compile/J9AliasBuilder.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ALIASBUILDER_INCL diff --git a/runtime/compiler/compile/J9Compilation.cpp b/runtime/compiler/compile/J9Compilation.cpp index 232a80b9a1c..bd2e0e93a9e 100644 --- a/runtime/compiler/compile/J9Compilation.cpp +++ b/runtime/compiler/compile/J9Compilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/compile/J9Compilation.hpp b/runtime/compiler/compile/J9Compilation.hpp index 3f2664d8451..a88806671c4 100644 --- a/runtime/compiler/compile/J9Compilation.hpp +++ b/runtime/compiler/compile/J9Compilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_J9_COMPILATIONBASE_INCL diff --git a/runtime/compiler/compile/J9Compilation_inlines.hpp b/runtime/compiler/compile/J9Compilation_inlines.hpp index b70471519e6..df46a057e38 100644 --- a/runtime/compiler/compile/J9Compilation_inlines.hpp +++ b/runtime/compiler/compile/J9Compilation_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_COMPILATION_INLINE_INCL diff --git a/runtime/compiler/compile/J9Method.cpp b/runtime/compiler/compile/J9Method.cpp index 8811fb75f81..071ea7088ad 100644 --- a/runtime/compiler/compile/J9Method.cpp +++ b/runtime/compiler/compile/J9Method.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Method.hpp" diff --git a/runtime/compiler/compile/J9Method.hpp b/runtime/compiler/compile/J9Method.hpp index 01b446a685d..11246a76366 100644 --- a/runtime/compiler/compile/J9Method.hpp +++ b/runtime/compiler/compile/J9Method.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_METHOD_INCL diff --git a/runtime/compiler/compile/J9NonHelperSymbols.enum b/runtime/compiler/compile/J9NonHelperSymbols.enum index bb058520b3c..b33cf70b533 100644 --- a/runtime/compiler/compile/J9NonHelperSymbols.enum +++ b/runtime/compiler/compile/J9NonHelperSymbols.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/compile/J9SymbolReferenceTable.cpp b/runtime/compiler/compile/J9SymbolReferenceTable.cpp index d22363b46bd..574f592c460 100644 --- a/runtime/compiler/compile/J9SymbolReferenceTable.cpp +++ b/runtime/compiler/compile/J9SymbolReferenceTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrformatconsts.h" diff --git a/runtime/compiler/compile/J9SymbolReferenceTable.hpp b/runtime/compiler/compile/J9SymbolReferenceTable.hpp index 512942c5b4d..9c3366c1cdd 100644 --- a/runtime/compiler/compile/J9SymbolReferenceTable.hpp +++ b/runtime/compiler/compile/J9SymbolReferenceTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SYMBOLREFERENCETABLE_INCL diff --git a/runtime/compiler/compile/Method.hpp b/runtime/compiler/compile/Method.hpp index b7ffa693d59..1d57de778b8 100644 --- a/runtime/compiler/compile/Method.hpp +++ b/runtime/compiler/compile/Method.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHOD_INCL diff --git a/runtime/compiler/compile/NonHelperSymbols.enum b/runtime/compiler/compile/NonHelperSymbols.enum index 526095128fc..3ec136d8590 100644 --- a/runtime/compiler/compile/NonHelperSymbols.enum +++ b/runtime/compiler/compile/NonHelperSymbols.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/J9NonHelperSymbols.enum" diff --git a/runtime/compiler/compile/SymbolReferenceTable.hpp b/runtime/compiler/compile/SymbolReferenceTable.hpp index c73b4556cd7..5ef9424a0e0 100644 --- a/runtime/compiler/compile/SymbolReferenceTable.hpp +++ b/runtime/compiler/compile/SymbolReferenceTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SYMBOLREFERENCETABLE_INCL diff --git a/runtime/compiler/compiler.mk b/runtime/compiler/compiler.mk index 1e8286a52fb..0762238e1c6 100644 --- a/runtime/compiler/compiler.mk +++ b/runtime/compiler/compiler.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # "all" should be the first target to appear so it's the default diff --git a/runtime/compiler/control/CMakeLists.txt b/runtime/compiler/control/CMakeLists.txt index 436ea83f752..554285d7d0f 100644 --- a/runtime/compiler/control/CMakeLists.txt +++ b/runtime/compiler/control/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/control/ClassHolder.hpp b/runtime/compiler/control/ClassHolder.hpp index 930ce6785cd..9c40f0a25df 100644 --- a/runtime/compiler/control/ClassHolder.hpp +++ b/runtime/compiler/control/ClassHolder.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLASSHOLDER_HPP diff --git a/runtime/compiler/control/CompilationPriority.hpp b/runtime/compiler/control/CompilationPriority.hpp index 837896c9b69..81465a896cd 100644 --- a/runtime/compiler/control/CompilationPriority.hpp +++ b/runtime/compiler/control/CompilationPriority.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATIONPRIORITY_HPP diff --git a/runtime/compiler/control/CompilationRuntime.hpp b/runtime/compiler/control/CompilationRuntime.hpp index bb67f37acfa..56fce72f8a8 100644 --- a/runtime/compiler/control/CompilationRuntime.hpp +++ b/runtime/compiler/control/CompilationRuntime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATION_RUNTIME_HPP diff --git a/runtime/compiler/control/CompilationStrategy.hpp b/runtime/compiler/control/CompilationStrategy.hpp index 8b27d79fdb2..d4d5c906de0 100644 --- a/runtime/compiler/control/CompilationStrategy.hpp +++ b/runtime/compiler/control/CompilationStrategy.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILATIONSTRATEGY_INCL diff --git a/runtime/compiler/control/CompilationThread.cpp b/runtime/compiler/control/CompilationThread.cpp index ff74b30ab04..87135efc6b2 100644 --- a/runtime/compiler/control/CompilationThread.cpp +++ b/runtime/compiler/control/CompilationThread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/control/CompilationThread.hpp b/runtime/compiler/control/CompilationThread.hpp index 1de496b46d7..1b272e1b5ae 100644 --- a/runtime/compiler/control/CompilationThread.hpp +++ b/runtime/compiler/control/CompilationThread.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILATIONTHREAD_INCL diff --git a/runtime/compiler/control/CompileBeforeCheckpoint.cpp b/runtime/compiler/control/CompileBeforeCheckpoint.cpp index 39539b4a163..76294c180b9 100644 --- a/runtime/compiler/control/CompileBeforeCheckpoint.cpp +++ b/runtime/compiler/control/CompileBeforeCheckpoint.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/control/CompileBeforeCheckpoint.hpp b/runtime/compiler/control/CompileBeforeCheckpoint.hpp index c4856a9c6bd..cf715a85b40 100644 --- a/runtime/compiler/control/CompileBeforeCheckpoint.hpp +++ b/runtime/compiler/control/CompileBeforeCheckpoint.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILEBEFORECHECKPOINT_INCL diff --git a/runtime/compiler/control/DLLMain.cpp b/runtime/compiler/control/DLLMain.cpp index 8f39bc5b771..a19b10a02db 100644 --- a/runtime/compiler/control/DLLMain.cpp +++ b/runtime/compiler/control/DLLMain.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/control/HookedByTheJit.cpp b/runtime/compiler/control/HookedByTheJit.cpp index ffb1a853e8e..1d1ac4ce905 100644 --- a/runtime/compiler/control/HookedByTheJit.cpp +++ b/runtime/compiler/control/HookedByTheJit.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/control/J9CompilationStrategy.cpp b/runtime/compiler/control/J9CompilationStrategy.cpp index 50a8868eea7..44c450e3eb8 100644 --- a/runtime/compiler/control/J9CompilationStrategy.cpp +++ b/runtime/compiler/control/J9CompilationStrategy.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/CompilationStrategy.hpp" diff --git a/runtime/compiler/control/J9CompilationStrategy.hpp b/runtime/compiler/control/J9CompilationStrategy.hpp index f9a4ffd37e9..05163716da9 100644 --- a/runtime/compiler/control/J9CompilationStrategy.hpp +++ b/runtime/compiler/control/J9CompilationStrategy.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_COMPILATIONSTRATEGY_INCL diff --git a/runtime/compiler/control/J9Options.cpp b/runtime/compiler/control/J9Options.cpp index 3acaf9cea34..0b9011fb794 100644 --- a/runtime/compiler/control/J9Options.cpp +++ b/runtime/compiler/control/J9Options.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/J9Options.hpp" diff --git a/runtime/compiler/control/J9Options.hpp b/runtime/compiler/control/J9Options.hpp index f36d2318750..dee782f984d 100644 --- a/runtime/compiler/control/J9Options.hpp +++ b/runtime/compiler/control/J9Options.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_OPTIONS_INCL diff --git a/runtime/compiler/control/J9Recompilation.cpp b/runtime/compiler/control/J9Recompilation.cpp index 78b416d9187..7fbe290dfa7 100644 --- a/runtime/compiler/control/J9Recompilation.cpp +++ b/runtime/compiler/control/J9Recompilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicSupport.hpp" diff --git a/runtime/compiler/control/J9Recompilation.hpp b/runtime/compiler/control/J9Recompilation.hpp index 587ae7aa221..4970d21f9a7 100644 --- a/runtime/compiler/control/J9Recompilation.hpp +++ b/runtime/compiler/control/J9Recompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_RECOMPILATION_INCL diff --git a/runtime/compiler/control/JITClientCompilationThread.cpp b/runtime/compiler/control/JITClientCompilationThread.cpp index bf73b0b8be0..f50c04d6f97 100644 --- a/runtime/compiler/control/JITClientCompilationThread.cpp +++ b/runtime/compiler/control/JITClientCompilationThread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/control/JITClientCompilationThread.hpp b/runtime/compiler/control/JITClientCompilationThread.hpp index 94166ac500a..bf2d31b9055 100644 --- a/runtime/compiler/control/JITClientCompilationThread.hpp +++ b/runtime/compiler/control/JITClientCompilationThread.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITCLIENT_COMPILATION_THREAD_H diff --git a/runtime/compiler/control/JITServerCompilationThread.cpp b/runtime/compiler/control/JITServerCompilationThread.cpp index 478878f153b..1c37a0ed963 100644 --- a/runtime/compiler/control/JITServerCompilationThread.cpp +++ b/runtime/compiler/control/JITServerCompilationThread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/JITServerCompilationThread.hpp" diff --git a/runtime/compiler/control/JITServerCompilationThread.hpp b/runtime/compiler/control/JITServerCompilationThread.hpp index 235301b1acf..8687918a548 100644 --- a/runtime/compiler/control/JITServerCompilationThread.hpp +++ b/runtime/compiler/control/JITServerCompilationThread.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_COMPILATION_THREAD_H diff --git a/runtime/compiler/control/JITServerHelpers.cpp b/runtime/compiler/control/JITServerHelpers.cpp index ae368e89f62..e4b9b7fee92 100644 --- a/runtime/compiler/control/JITServerHelpers.cpp +++ b/runtime/compiler/control/JITServerHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/JITServerHelpers.hpp" diff --git a/runtime/compiler/control/JITServerHelpers.hpp b/runtime/compiler/control/JITServerHelpers.hpp index 554ffc34b6c..d9aa9b869c0 100644 --- a/runtime/compiler/control/JITServerHelpers.hpp +++ b/runtime/compiler/control/JITServerHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_HELPERS_H diff --git a/runtime/compiler/control/JitDump.cpp b/runtime/compiler/control/JitDump.cpp index 6e15fb042af..12819cf5cc1 100644 --- a/runtime/compiler/control/JitDump.cpp +++ b/runtime/compiler/control/JitDump.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/JitDump.hpp" diff --git a/runtime/compiler/control/JitDump.hpp b/runtime/compiler/control/JitDump.hpp index 85159232306..843f15d6ab2 100644 --- a/runtime/compiler/control/JitDump.hpp +++ b/runtime/compiler/control/JitDump.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_JITDUMP_INCL diff --git a/runtime/compiler/control/MethodToBeCompiled.cpp b/runtime/compiler/control/MethodToBeCompiled.cpp index 90bc7fde9c4..925e92214f0 100644 --- a/runtime/compiler/control/MethodToBeCompiled.cpp +++ b/runtime/compiler/control/MethodToBeCompiled.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/MethodToBeCompiled.hpp" diff --git a/runtime/compiler/control/MethodToBeCompiled.hpp b/runtime/compiler/control/MethodToBeCompiled.hpp index 9806a552a03..46d544f4c3f 100644 --- a/runtime/compiler/control/MethodToBeCompiled.hpp +++ b/runtime/compiler/control/MethodToBeCompiled.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef METHODTOBECOMPILED_HPP diff --git a/runtime/compiler/control/Options.hpp b/runtime/compiler/control/Options.hpp index 1e3016209d3..bb38cc23d58 100644 --- a/runtime/compiler/control/Options.hpp +++ b/runtime/compiler/control/Options.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIONS_INCL diff --git a/runtime/compiler/control/OptionsPostRestore.cpp b/runtime/compiler/control/OptionsPostRestore.cpp index 00156cf1b16..571428e2921 100644 --- a/runtime/compiler/control/OptionsPostRestore.cpp +++ b/runtime/compiler/control/OptionsPostRestore.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/control/OptionsPostRestore.hpp b/runtime/compiler/control/OptionsPostRestore.hpp index f76d096632a..0746dd043df 100644 --- a/runtime/compiler/control/OptionsPostRestore.hpp +++ b/runtime/compiler/control/OptionsPostRestore.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OPTIONS_POST_RESTORE_HPP #define OPTIONS_POST_RESTORE_HPP diff --git a/runtime/compiler/control/Recompilation.hpp b/runtime/compiler/control/Recompilation.hpp index 578e9210b1e..deb8ad26924 100644 --- a/runtime/compiler/control/Recompilation.hpp +++ b/runtime/compiler/control/Recompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RECOMPILATION_INCL diff --git a/runtime/compiler/control/RecompilationInfo.hpp b/runtime/compiler/control/RecompilationInfo.hpp index 1c1cc85109f..c36d1ac07fb 100644 --- a/runtime/compiler/control/RecompilationInfo.hpp +++ b/runtime/compiler/control/RecompilationInfo.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RECOMPILATION_INFO_INCL diff --git a/runtime/compiler/control/rossa.cpp b/runtime/compiler/control/rossa.cpp index 26fe00d68c1..1f7434da4a5 100644 --- a/runtime/compiler/control/rossa.cpp +++ b/runtime/compiler/control/rossa.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/control/rossa.h b/runtime/compiler/control/rossa.h index f3d4d67b828..78e373b930a 100644 --- a/runtime/compiler/control/rossa.h +++ b/runtime/compiler/control/rossa.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef __ROSSA_H diff --git a/runtime/compiler/env/ArithEnv.hpp b/runtime/compiler/env/ArithEnv.hpp index dc6281523dd..fd910529e38 100644 --- a/runtime/compiler/env/ArithEnv.hpp +++ b/runtime/compiler/env/ArithEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ARITHENV_INCL diff --git a/runtime/compiler/env/CHTable.cpp b/runtime/compiler/env/CHTable.cpp index b2a52fa6467..e7fd8cadd9f 100644 --- a/runtime/compiler/env/CHTable.cpp +++ b/runtime/compiler/env/CHTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CHTable.hpp" diff --git a/runtime/compiler/env/CHTable.hpp b/runtime/compiler/env/CHTable.hpp index e8fa8bbab2c..305eda1c9d6 100644 --- a/runtime/compiler/env/CHTable.hpp +++ b/runtime/compiler/env/CHTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CHTABLE_INCL diff --git a/runtime/compiler/env/CMakeLists.txt b/runtime/compiler/env/CMakeLists.txt index c77cc2e2292..37f1e499cd4 100644 --- a/runtime/compiler/env/CMakeLists.txt +++ b/runtime/compiler/env/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/env/CPU.hpp b/runtime/compiler/env/CPU.hpp index 0dfa7b698da..474f528b531 100644 --- a/runtime/compiler/env/CPU.hpp +++ b/runtime/compiler/env/CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CPU_INCL diff --git a/runtime/compiler/env/ClassEnv.hpp b/runtime/compiler/env/ClassEnv.hpp index 223d2c50e31..19834145f84 100644 --- a/runtime/compiler/env/ClassEnv.hpp +++ b/runtime/compiler/env/ClassEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CLASSENV_INCL diff --git a/runtime/compiler/env/ClassLoaderTable.cpp b/runtime/compiler/env/ClassLoaderTable.cpp index 632cc2aaac4..c3d5c430ae8 100644 --- a/runtime/compiler/env/ClassLoaderTable.cpp +++ b/runtime/compiler/env/ClassLoaderTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicSupport.hpp" diff --git a/runtime/compiler/env/ClassLoaderTable.hpp b/runtime/compiler/env/ClassLoaderTable.hpp index 167ac75c7d1..7bf703420eb 100644 --- a/runtime/compiler/env/ClassLoaderTable.hpp +++ b/runtime/compiler/env/ClassLoaderTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLASSLOADERTABLE_INCL diff --git a/runtime/compiler/env/ClassTableCriticalSection.hpp b/runtime/compiler/env/ClassTableCriticalSection.hpp index b17ab31818b..e8f72a0250c 100644 --- a/runtime/compiler/env/ClassTableCriticalSection.hpp +++ b/runtime/compiler/env/ClassTableCriticalSection.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CLASSTABLECRITICALSECTION_INCL diff --git a/runtime/compiler/env/ClassUnloadMonitorCriticalSection.hpp b/runtime/compiler/env/ClassUnloadMonitorCriticalSection.hpp index cf4275b1c21..14f7211096a 100644 --- a/runtime/compiler/env/ClassUnloadMonitorCriticalSection.hpp +++ b/runtime/compiler/env/ClassUnloadMonitorCriticalSection.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CLASUNLOADMONITORCRITICALSECTION_INCL diff --git a/runtime/compiler/env/CompilerEnv.hpp b/runtime/compiler/env/CompilerEnv.hpp index d19a584d931..a307b4337be 100644 --- a/runtime/compiler/env/CompilerEnv.hpp +++ b/runtime/compiler/env/CompilerEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_COMPILER_ENV_INCL diff --git a/runtime/compiler/env/CpuUtilization.cpp b/runtime/compiler/env/CpuUtilization.cpp index b705bf2606f..84a187fa20d 100644 --- a/runtime/compiler/env/CpuUtilization.cpp +++ b/runtime/compiler/env/CpuUtilization.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/CompilationRuntime.hpp" diff --git a/runtime/compiler/env/CpuUtilization.hpp b/runtime/compiler/env/CpuUtilization.hpp index 9fabfc396b4..79511e9d617 100644 --- a/runtime/compiler/env/CpuUtilization.hpp +++ b/runtime/compiler/env/CpuUtilization.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CPUUTILIZATION_HPP diff --git a/runtime/compiler/env/DebugEnv.hpp b/runtime/compiler/env/DebugEnv.hpp index 1190ab8f420..71eb3d3dd7c 100644 --- a/runtime/compiler/env/DebugEnv.hpp +++ b/runtime/compiler/env/DebugEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_DEBUGENV_INCL diff --git a/runtime/compiler/env/FilePointer.cpp b/runtime/compiler/env/FilePointer.cpp index 68771193f5c..a9c79f1e0e9 100644 --- a/runtime/compiler/env/FilePointer.cpp +++ b/runtime/compiler/env/FilePointer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/env/FilePointer.hpp b/runtime/compiler/env/FilePointer.hpp index de3f594a5c9..35e25235331 100644 --- a/runtime/compiler/env/FilePointer.hpp +++ b/runtime/compiler/env/FilePointer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FILEPOINTER_INCL diff --git a/runtime/compiler/env/FilePointerDecl.hpp b/runtime/compiler/env/FilePointerDecl.hpp index 086922fdf67..87bbc3cf46a 100644 --- a/runtime/compiler/env/FilePointerDecl.hpp +++ b/runtime/compiler/env/FilePointerDecl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_FILE_POINTER_DECL_INCL diff --git a/runtime/compiler/env/IO.hpp b/runtime/compiler/env/IO.hpp index f7d1744bb46..58a7561873a 100644 --- a/runtime/compiler/env/IO.hpp +++ b/runtime/compiler/env/IO.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_IO_INCL diff --git a/runtime/compiler/env/J2IThunk.cpp b/runtime/compiler/env/J2IThunk.cpp index 68de0e627f4..091da562f8d 100644 --- a/runtime/compiler/env/J2IThunk.cpp +++ b/runtime/compiler/env/J2IThunk.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/J2IThunk.hpp" diff --git a/runtime/compiler/env/J2IThunk.hpp b/runtime/compiler/env/J2IThunk.hpp index 39ce0642fb2..90bbb0146ac 100644 --- a/runtime/compiler/env/J2IThunk.hpp +++ b/runtime/compiler/env/J2IThunk.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_J2ITHUNK_INCL diff --git a/runtime/compiler/env/J9ArithEnv.cpp b/runtime/compiler/env/J9ArithEnv.cpp index 53f89802778..106e9846d2f 100644 --- a/runtime/compiler/env/J9ArithEnv.cpp +++ b/runtime/compiler/env/J9ArithEnv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/env/J9ArithEnv.hpp b/runtime/compiler/env/J9ArithEnv.hpp index 35936823a36..5d6b0a950ce 100644 --- a/runtime/compiler/env/J9ArithEnv.hpp +++ b/runtime/compiler/env/J9ArithEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ARITHENV_INCL diff --git a/runtime/compiler/env/J9CPU.cpp b/runtime/compiler/env/J9CPU.cpp index 3dcea46e112..939dfd8ff52 100644 --- a/runtime/compiler/env/J9CPU.cpp +++ b/runtime/compiler/env/J9CPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/env/J9CPU.hpp b/runtime/compiler/env/J9CPU.hpp index b77d1b1dc38..13f5a7adcb6 100644 --- a/runtime/compiler/env/J9CPU.hpp +++ b/runtime/compiler/env/J9CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CPU_INCL diff --git a/runtime/compiler/env/J9ClassEnv.cpp b/runtime/compiler/env/J9ClassEnv.cpp index 8b15db404c4..e0f2bd5c6c3 100644 --- a/runtime/compiler/env/J9ClassEnv.cpp +++ b/runtime/compiler/env/J9ClassEnv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/env/J9ClassEnv.hpp b/runtime/compiler/env/J9ClassEnv.hpp index 1d46e959002..e4cc4de47da 100644 --- a/runtime/compiler/env/J9ClassEnv.hpp +++ b/runtime/compiler/env/J9ClassEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CLASSENV_INCL diff --git a/runtime/compiler/env/J9CompilerEnv.cpp b/runtime/compiler/env/J9CompilerEnv.cpp index bd35507af7d..db6687601c7 100644 --- a/runtime/compiler/env/J9CompilerEnv.cpp +++ b/runtime/compiler/env/J9CompilerEnv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/runtime/compiler/env/J9CompilerEnv.hpp b/runtime/compiler/env/J9CompilerEnv.hpp index 96fcdc0ad86..b99658b8826 100644 --- a/runtime/compiler/env/J9CompilerEnv.hpp +++ b/runtime/compiler/env/J9CompilerEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_COMPILER_ENV_INCL diff --git a/runtime/compiler/env/J9DebugEnv.cpp b/runtime/compiler/env/J9DebugEnv.cpp index d426641065d..089070399ab 100644 --- a/runtime/compiler/env/J9DebugEnv.cpp +++ b/runtime/compiler/env/J9DebugEnv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/env/J9DebugEnv.hpp b/runtime/compiler/env/J9DebugEnv.hpp index 61922e9e10e..66594485234 100644 --- a/runtime/compiler/env/J9DebugEnv.hpp +++ b/runtime/compiler/env/J9DebugEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_DEBUGENV_INCL diff --git a/runtime/compiler/env/J9IO.cpp b/runtime/compiler/env/J9IO.cpp index 92578dd656e..94345e3e11d 100644 --- a/runtime/compiler/env/J9IO.cpp +++ b/runtime/compiler/env/J9IO.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/env/J9IO.hpp b/runtime/compiler/env/J9IO.hpp index e838f0489d5..127ec8f4162 100644 --- a/runtime/compiler/env/J9IO.hpp +++ b/runtime/compiler/env/J9IO.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_IO_INCL diff --git a/runtime/compiler/env/J9JitMemory.cpp b/runtime/compiler/env/J9JitMemory.cpp index e2be3a3a529..928a6f44e30 100644 --- a/runtime/compiler/env/J9JitMemory.cpp +++ b/runtime/compiler/env/J9JitMemory.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/env/J9JitMemory.hpp b/runtime/compiler/env/J9JitMemory.hpp index d08c3001181..45ab91323fb 100644 --- a/runtime/compiler/env/J9JitMemory.hpp +++ b/runtime/compiler/env/J9JitMemory.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9JITMEMORY_INCL diff --git a/runtime/compiler/env/J9KnownObjectTable.cpp b/runtime/compiler/env/J9KnownObjectTable.cpp index 8d17b35460a..495781512c3 100644 --- a/runtime/compiler/env/J9KnownObjectTable.cpp +++ b/runtime/compiler/env/J9KnownObjectTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/env/J9KnownObjectTable.hpp b/runtime/compiler/env/J9KnownObjectTable.hpp index bd6bdf53f5d..f8cc81746af 100644 --- a/runtime/compiler/env/J9KnownObjectTable.hpp +++ b/runtime/compiler/env/J9KnownObjectTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_KNOWN_OBJECT_TABLE_INCL diff --git a/runtime/compiler/env/J9ObjectModel.cpp b/runtime/compiler/env/J9ObjectModel.cpp index 5638c714873..8e7da8d58d4 100644 --- a/runtime/compiler/env/J9ObjectModel.cpp +++ b/runtime/compiler/env/J9ObjectModel.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/env/J9ObjectModel.hpp b/runtime/compiler/env/J9ObjectModel.hpp index fb1cad4c19d..3e20fa26f98 100644 --- a/runtime/compiler/env/J9ObjectModel.hpp +++ b/runtime/compiler/env/J9ObjectModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_OBJECTMODEL_INCL diff --git a/runtime/compiler/env/J9PersistentInfo.cpp b/runtime/compiler/env/J9PersistentInfo.cpp index 3afb3f4d68b..e94e9c336e3 100644 --- a/runtime/compiler/env/J9PersistentInfo.cpp +++ b/runtime/compiler/env/J9PersistentInfo.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" // for J9VM_OPT_JITSERVER #include "env/PersistentInfo.hpp" diff --git a/runtime/compiler/env/J9PersistentInfo.hpp b/runtime/compiler/env/J9PersistentInfo.hpp index acb4cd91151..61e1734fbf6 100644 --- a/runtime/compiler/env/J9PersistentInfo.hpp +++ b/runtime/compiler/env/J9PersistentInfo.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PERSISTENTINFO_HPP diff --git a/runtime/compiler/env/J9SegmentAllocator.cpp b/runtime/compiler/env/J9SegmentAllocator.cpp index bcd6802f995..3ea9d9476be 100644 --- a/runtime/compiler/env/J9SegmentAllocator.cpp +++ b/runtime/compiler/env/J9SegmentAllocator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/env/J9SegmentAllocator.hpp b/runtime/compiler/env/J9SegmentAllocator.hpp index dd712990c50..3ebc7cb4053 100644 --- a/runtime/compiler/env/J9SegmentAllocator.hpp +++ b/runtime/compiler/env/J9SegmentAllocator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SEGMENT_ALLOCATOR_HPP diff --git a/runtime/compiler/env/J9SegmentCache.cpp b/runtime/compiler/env/J9SegmentCache.cpp index 18ae440b029..4394b24dfdc 100644 --- a/runtime/compiler/env/J9SegmentCache.cpp +++ b/runtime/compiler/env/J9SegmentCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/J9SegmentCache.hpp" diff --git a/runtime/compiler/env/J9SegmentCache.hpp b/runtime/compiler/env/J9SegmentCache.hpp index 39da879be6c..6ebbe451165 100644 --- a/runtime/compiler/env/J9SegmentCache.hpp +++ b/runtime/compiler/env/J9SegmentCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9SEGMENT_CACHE_H diff --git a/runtime/compiler/env/J9SegmentProvider.cpp b/runtime/compiler/env/J9SegmentProvider.cpp index a1ef2607446..dda44c9d47a 100644 --- a/runtime/compiler/env/J9SegmentProvider.cpp +++ b/runtime/compiler/env/J9SegmentProvider.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/J9SegmentProvider.hpp" diff --git a/runtime/compiler/env/J9SegmentProvider.hpp b/runtime/compiler/env/J9SegmentProvider.hpp index 0677228f0e6..1578c69e6a5 100644 --- a/runtime/compiler/env/J9SegmentProvider.hpp +++ b/runtime/compiler/env/J9SegmentProvider.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SEGMENT_PROVIDER diff --git a/runtime/compiler/env/J9SharedCache.cpp b/runtime/compiler/env/J9SharedCache.cpp index c6250f9ed85..5ed2cd2b9ea 100644 --- a/runtime/compiler/env/J9SharedCache.cpp +++ b/runtime/compiler/env/J9SharedCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/J9SharedCache.hpp" diff --git a/runtime/compiler/env/J9SharedCache.hpp b/runtime/compiler/env/J9SharedCache.hpp index 1298e785aa7..d6899e19809 100644 --- a/runtime/compiler/env/J9SharedCache.hpp +++ b/runtime/compiler/env/J9SharedCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9SHARED_CACHE_HPP diff --git a/runtime/compiler/env/J9VMAccessCriticalSection.hpp b/runtime/compiler/env/J9VMAccessCriticalSection.hpp index d11a18f3593..bb05b5da66f 100644 --- a/runtime/compiler/env/J9VMAccessCriticalSection.hpp +++ b/runtime/compiler/env/J9VMAccessCriticalSection.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_VMACCESSCRITICALSECTION_INCL diff --git a/runtime/compiler/env/J9VMEnv.cpp b/runtime/compiler/env/J9VMEnv.cpp index 2b38678f237..c0dee8a4041 100644 --- a/runtime/compiler/env/J9VMEnv.cpp +++ b/runtime/compiler/env/J9VMEnv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/env/J9VMEnv.hpp b/runtime/compiler/env/J9VMEnv.hpp index 0ef77099fa9..3344382ed79 100644 --- a/runtime/compiler/env/J9VMEnv.hpp +++ b/runtime/compiler/env/J9VMEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_VMENV_INCL diff --git a/runtime/compiler/env/J9VMMethodEnv.cpp b/runtime/compiler/env/J9VMMethodEnv.cpp index f2b3e4604cb..59552308c0e 100644 --- a/runtime/compiler/env/J9VMMethodEnv.cpp +++ b/runtime/compiler/env/J9VMMethodEnv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/env/J9VMMethodEnv.hpp b/runtime/compiler/env/J9VMMethodEnv.hpp index 0da5bd44fed..5aa0b5168ac 100644 --- a/runtime/compiler/env/J9VMMethodEnv.hpp +++ b/runtime/compiler/env/J9VMMethodEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_VMMETHODENV_INCL diff --git a/runtime/compiler/env/JITServerAllocationRegion.hpp b/runtime/compiler/env/JITServerAllocationRegion.hpp index 825230e318e..33586e79276 100644 --- a/runtime/compiler/env/JITServerAllocationRegion.hpp +++ b/runtime/compiler/env/JITServerAllocationRegion.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_ALLOCATION_REGION_HPP diff --git a/runtime/compiler/env/JITServerCHTable.cpp b/runtime/compiler/env/JITServerCHTable.cpp index 26c59ffa225..c2d0fab6b29 100644 --- a/runtime/compiler/env/JITServerCHTable.cpp +++ b/runtime/compiler/env/JITServerCHTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CHTable.hpp" diff --git a/runtime/compiler/env/JITServerCHTable.hpp b/runtime/compiler/env/JITServerCHTable.hpp index 6d951cadf75..cb137992168 100644 --- a/runtime/compiler/env/JITServerCHTable.hpp +++ b/runtime/compiler/env/JITServerCHTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_CHTABLE_H diff --git a/runtime/compiler/env/JITServerPersistentCHTable.cpp b/runtime/compiler/env/JITServerPersistentCHTable.cpp index b0f7831c0cf..ef5c7c4f139 100644 --- a/runtime/compiler/env/JITServerPersistentCHTable.cpp +++ b/runtime/compiler/env/JITServerPersistentCHTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JITServerPersistentCHTable.hpp" diff --git a/runtime/compiler/env/JITServerPersistentCHTable.hpp b/runtime/compiler/env/JITServerPersistentCHTable.hpp index 0e092327423..65cc36b3031 100644 --- a/runtime/compiler/env/JITServerPersistentCHTable.hpp +++ b/runtime/compiler/env/JITServerPersistentCHTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_PERSISTENT_CHTABLE_H diff --git a/runtime/compiler/env/JSR292Methods.h b/runtime/compiler/env/JSR292Methods.h index d018866246d..3295c088633 100644 --- a/runtime/compiler/env/JSR292Methods.h +++ b/runtime/compiler/env/JSR292Methods.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JSR292Methods_h diff --git a/runtime/compiler/env/KnownObjectTable.hpp b/runtime/compiler/env/KnownObjectTable.hpp index edc14b223f7..773224ea67d 100644 --- a/runtime/compiler/env/KnownObjectTable.hpp +++ b/runtime/compiler/env/KnownObjectTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_KNOWN_OBJECT_TABLE_INCL diff --git a/runtime/compiler/env/ObjectModel.hpp b/runtime/compiler/env/ObjectModel.hpp index 5119a227b43..9e59be87aea 100644 --- a/runtime/compiler/env/ObjectModel.hpp +++ b/runtime/compiler/env/ObjectModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OBJECTMODEL_INCL diff --git a/runtime/compiler/env/PersistentAllocator.cpp b/runtime/compiler/env/PersistentAllocator.cpp index 99487b7d91e..301fbd6cc41 100644 --- a/runtime/compiler/env/PersistentAllocator.cpp +++ b/runtime/compiler/env/PersistentAllocator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/PersistentAllocator.hpp" diff --git a/runtime/compiler/env/PersistentAllocator.hpp b/runtime/compiler/env/PersistentAllocator.hpp index 15db6a777e4..22f19ef3fac 100644 --- a/runtime/compiler/env/PersistentAllocator.hpp +++ b/runtime/compiler/env/PersistentAllocator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PERSISTENT_ALLOCATOR_HPP diff --git a/runtime/compiler/env/PersistentAllocatorKit.hpp b/runtime/compiler/env/PersistentAllocatorKit.hpp index 597903fa72e..0c19a769bc5 100644 --- a/runtime/compiler/env/PersistentAllocatorKit.hpp +++ b/runtime/compiler/env/PersistentAllocatorKit.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PERSISTENTALLOCATORKIT_HPP diff --git a/runtime/compiler/env/PersistentCHTable.cpp b/runtime/compiler/env/PersistentCHTable.cpp index 35c27401ff1..41115b5ef1a 100644 --- a/runtime/compiler/env/PersistentCHTable.cpp +++ b/runtime/compiler/env/PersistentCHTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/PersistentCHTable.hpp" diff --git a/runtime/compiler/env/PersistentCHTable.hpp b/runtime/compiler/env/PersistentCHTable.hpp index 72c403fe6da..dacdc91b535 100644 --- a/runtime/compiler/env/PersistentCHTable.hpp +++ b/runtime/compiler/env/PersistentCHTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PERSISTENTCHTABLE_INCL diff --git a/runtime/compiler/env/PersistentCollections.hpp b/runtime/compiler/env/PersistentCollections.hpp index a7a28c5db1c..5ce5ec10f9b 100644 --- a/runtime/compiler/env/PersistentCollections.hpp +++ b/runtime/compiler/env/PersistentCollections.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PERSISTENT_COLLECTIONS_H diff --git a/runtime/compiler/env/PersistentInfo.hpp b/runtime/compiler/env/PersistentInfo.hpp index 8a7a3242329..7cb699e1561 100644 --- a/runtime/compiler/env/PersistentInfo.hpp +++ b/runtime/compiler/env/PersistentInfo.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PERSISTENTINFO_INCL diff --git a/runtime/compiler/env/ProcessorDetection.cpp b/runtime/compiler/env/ProcessorDetection.cpp index 560e3084440..2142ed43560 100644 --- a/runtime/compiler/env/ProcessorDetection.cpp +++ b/runtime/compiler/env/ProcessorDetection.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/env/RawAllocator.hpp b/runtime/compiler/env/RawAllocator.hpp index f3d30d48c77..d5436531c82 100644 --- a/runtime/compiler/env/RawAllocator.hpp +++ b/runtime/compiler/env/RawAllocator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RAWALLOCATOR_HPP diff --git a/runtime/compiler/env/RuntimeAssumptionTable.hpp b/runtime/compiler/env/RuntimeAssumptionTable.hpp index de05edd963b..8f4e6d8e8ad 100644 --- a/runtime/compiler/env/RuntimeAssumptionTable.hpp +++ b/runtime/compiler/env/RuntimeAssumptionTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMEASSUMPTIONTABLE_HPP diff --git a/runtime/compiler/env/SharedCache.hpp b/runtime/compiler/env/SharedCache.hpp index b22cb0dcfe8..1af76473bb6 100644 --- a/runtime/compiler/env/SharedCache.hpp +++ b/runtime/compiler/env/SharedCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SHARED_CACHE_HPP diff --git a/runtime/compiler/env/Startup.cpp b/runtime/compiler/env/Startup.cpp index 41c3abb2f20..09131c7271a 100644 --- a/runtime/compiler/env/Startup.cpp +++ b/runtime/compiler/env/Startup.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/CompilerEnv.hpp" diff --git a/runtime/compiler/env/SystemSegmentProvider.cpp b/runtime/compiler/env/SystemSegmentProvider.cpp index 1ee72022769..f88c767d0b6 100644 --- a/runtime/compiler/env/SystemSegmentProvider.cpp +++ b/runtime/compiler/env/SystemSegmentProvider.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "SystemSegmentProvider.hpp" diff --git a/runtime/compiler/env/SystemSegmentProvider.hpp b/runtime/compiler/env/SystemSegmentProvider.hpp index ccab16b18b6..626ef7666b9 100644 --- a/runtime/compiler/env/SystemSegmentProvider.hpp +++ b/runtime/compiler/env/SystemSegmentProvider.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SYSTEMSEGMENTPROVIDER_H diff --git a/runtime/compiler/env/VMAccessCriticalSection.hpp b/runtime/compiler/env/VMAccessCriticalSection.hpp index 6b9cd66936e..3d198e7bb3e 100644 --- a/runtime/compiler/env/VMAccessCriticalSection.hpp +++ b/runtime/compiler/env/VMAccessCriticalSection.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VMACCESSCRITICALSECTION_INCL diff --git a/runtime/compiler/env/VMEnv.hpp b/runtime/compiler/env/VMEnv.hpp index 39cbc150a2f..7795027c91a 100644 --- a/runtime/compiler/env/VMEnv.hpp +++ b/runtime/compiler/env/VMEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VMENV_INCL diff --git a/runtime/compiler/env/VMJ9.cpp b/runtime/compiler/env/VMJ9.cpp index 7ab1f23e37e..3517a8ee077 100644 --- a/runtime/compiler/env/VMJ9.cpp +++ b/runtime/compiler/env/VMJ9.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/env/VMJ9.h b/runtime/compiler/env/VMJ9.h index 7fd2cb3ed2f..a038b439ff4 100644 --- a/runtime/compiler/env/VMJ9.h +++ b/runtime/compiler/env/VMJ9.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VMJ9_h diff --git a/runtime/compiler/env/VMJ9Server.cpp b/runtime/compiler/env/VMJ9Server.cpp index e7890e701f1..75fea906037 100644 --- a/runtime/compiler/env/VMJ9Server.cpp +++ b/runtime/compiler/env/VMJ9Server.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jitprotos.h" #include "net/ServerStream.hpp" diff --git a/runtime/compiler/env/VMJ9Server.hpp b/runtime/compiler/env/VMJ9Server.hpp index 83fac1ed2fe..6df4e2fdb8a 100644 --- a/runtime/compiler/env/VMJ9Server.hpp +++ b/runtime/compiler/env/VMJ9Server.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VMJ9SERVER_H diff --git a/runtime/compiler/env/VMMethodEnv.hpp b/runtime/compiler/env/VMMethodEnv.hpp index 35af7516e42..3fd406d7630 100644 --- a/runtime/compiler/env/VMMethodEnv.hpp +++ b/runtime/compiler/env/VMMethodEnv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VMMETHODENV_INCL diff --git a/runtime/compiler/env/annotations/AnnotationBase.cpp b/runtime/compiler/env/annotations/AnnotationBase.cpp index 821b47cda14..d797fdb53d8 100644 --- a/runtime/compiler/env/annotations/AnnotationBase.cpp +++ b/runtime/compiler/env/annotations/AnnotationBase.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9_EXTERNAL_TO_VM diff --git a/runtime/compiler/env/annotations/AnnotationBase.hpp b/runtime/compiler/env/annotations/AnnotationBase.hpp index 8e7b7021606..f6e9204ed23 100644 --- a/runtime/compiler/env/annotations/AnnotationBase.hpp +++ b/runtime/compiler/env/annotations/AnnotationBase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ANNOTATIONBASE_INCL diff --git a/runtime/compiler/env/annotations/AnnotationTable.inc b/runtime/compiler/env/annotations/AnnotationTable.inc index cb48c0cb029..1705c694daf 100644 --- a/runtime/compiler/env/annotations/AnnotationTable.inc +++ b/runtime/compiler/env/annotations/AnnotationTable.inc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Entries for each annotation */ diff --git a/runtime/compiler/env/annotations/Annotations.cpp b/runtime/compiler/env/annotations/Annotations.cpp index 5620d40caad..add42f6bf22 100644 --- a/runtime/compiler/env/annotations/Annotations.cpp +++ b/runtime/compiler/env/annotations/Annotations.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/env/annotations/GPUAnnotation.cpp b/runtime/compiler/env/annotations/GPUAnnotation.cpp index fb14304c4f2..0c31231ce03 100644 --- a/runtime/compiler/env/annotations/GPUAnnotation.cpp +++ b/runtime/compiler/env/annotations/GPUAnnotation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/annotations/GPUAnnotation.hpp" diff --git a/runtime/compiler/env/annotations/GPUAnnotation.hpp b/runtime/compiler/env/annotations/GPUAnnotation.hpp index e90502bc298..bc0bed718dc 100644 --- a/runtime/compiler/env/annotations/GPUAnnotation.hpp +++ b/runtime/compiler/env/annotations/GPUAnnotation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GPUANNOTATION_INCL diff --git a/runtime/compiler/env/annotations/TRNoSideFXAnnotation.cpp b/runtime/compiler/env/annotations/TRNoSideFXAnnotation.cpp index 5a1fecfe76f..b7f9d4bcba9 100644 --- a/runtime/compiler/env/annotations/TRNoSideFXAnnotation.cpp +++ b/runtime/compiler/env/annotations/TRNoSideFXAnnotation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/annotations/TRNoSideFXAnnotation.hpp" diff --git a/runtime/compiler/env/annotations/TRNoSideFXAnnotation.hpp b/runtime/compiler/env/annotations/TRNoSideFXAnnotation.hpp index 4b8b7db9681..b963ba0a637 100644 --- a/runtime/compiler/env/annotations/TRNoSideFXAnnotation.hpp +++ b/runtime/compiler/env/annotations/TRNoSideFXAnnotation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ANNOTATIONNOSIDEFX_INCL diff --git a/runtime/compiler/env/annotations/TROptAnnotation.cpp b/runtime/compiler/env/annotations/TROptAnnotation.cpp index 28cfbc6b4d6..aafb71e28bc 100644 --- a/runtime/compiler/env/annotations/TROptAnnotation.cpp +++ b/runtime/compiler/env/annotations/TROptAnnotation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/annotations/TROptAnnotation.hpp" diff --git a/runtime/compiler/env/annotations/TROptAnnotation.hpp b/runtime/compiler/env/annotations/TROptAnnotation.hpp index 72dd2c95105..663b8047507 100644 --- a/runtime/compiler/env/annotations/TROptAnnotation.hpp +++ b/runtime/compiler/env/annotations/TROptAnnotation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ANNOTATIONTROPT_INCL diff --git a/runtime/compiler/env/annotations/TestAnnotation.cpp b/runtime/compiler/env/annotations/TestAnnotation.cpp index 026d6c1323d..dc1adc4eb91 100644 --- a/runtime/compiler/env/annotations/TestAnnotation.cpp +++ b/runtime/compiler/env/annotations/TestAnnotation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "TestAnnotation.hpp" diff --git a/runtime/compiler/env/annotations/TestAnnotation.hpp b/runtime/compiler/env/annotations/TestAnnotation.hpp index fd9aa9b016a..c33ae410357 100644 --- a/runtime/compiler/env/annotations/TestAnnotation.hpp +++ b/runtime/compiler/env/annotations/TestAnnotation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TESTANNOTATION_INCL diff --git a/runtime/compiler/env/annotations/VMJ9Annotations.cpp b/runtime/compiler/env/annotations/VMJ9Annotations.cpp index e41e92cf462..1d3d34c6d1f 100644 --- a/runtime/compiler/env/annotations/VMJ9Annotations.cpp +++ b/runtime/compiler/env/annotations/VMJ9Annotations.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/VMJ9.h" diff --git a/runtime/compiler/env/exports.h b/runtime/compiler/env/exports.h index 59e2dd06e2e..f1394c7e9da 100644 --- a/runtime/compiler/env/exports.h +++ b/runtime/compiler/env/exports.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef EXPORTS_H diff --git a/runtime/compiler/env/j9field.h b/runtime/compiler/env/j9field.h index 52cfb0824e9..81cc0f2c40c 100644 --- a/runtime/compiler/env/j9field.h +++ b/runtime/compiler/env/j9field.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9field_h diff --git a/runtime/compiler/env/j9fieldsInfo.cpp b/runtime/compiler/env/j9fieldsInfo.cpp index aa566873cf8..1e4da7cec7e 100644 --- a/runtime/compiler/env/j9fieldsInfo.cpp +++ b/runtime/compiler/env/j9fieldsInfo.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/env/j9fieldsInfo.h b/runtime/compiler/env/j9fieldsInfo.h index 4ddbed9529f..ca5163634f8 100644 --- a/runtime/compiler/env/j9fieldsInfo.h +++ b/runtime/compiler/env/j9fieldsInfo.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9fieldsInfo_h diff --git a/runtime/compiler/env/j9jit.tdf b/runtime/compiler/env/j9jit.tdf index 854f4ced54c..b9fe23ddebb 100644 --- a/runtime/compiler/env/j9jit.tdf +++ b/runtime/compiler/env/j9jit.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 // make -f makefile.buildtools tracing diff --git a/runtime/compiler/env/j9method.cpp b/runtime/compiler/env/j9method.cpp index b1aa07f09e6..d5f7f0bc4c9 100644 --- a/runtime/compiler/env/j9method.cpp +++ b/runtime/compiler/env/j9method.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/j9method.h" diff --git a/runtime/compiler/env/j9method.h b/runtime/compiler/env/j9method.h index 453426671bc..94350da89a6 100644 --- a/runtime/compiler/env/j9method.h +++ b/runtime/compiler/env/j9method.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9method_h diff --git a/runtime/compiler/env/j9methodServer.cpp b/runtime/compiler/env/j9methodServer.cpp index a970f10c7f7..9be397d1f2b 100644 --- a/runtime/compiler/env/j9methodServer.cpp +++ b/runtime/compiler/env/j9methodServer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9methodServer.hpp" diff --git a/runtime/compiler/env/j9methodServer.hpp b/runtime/compiler/env/j9methodServer.hpp index cd08a2affe4..628b7d9741f 100644 --- a/runtime/compiler/env/j9methodServer.hpp +++ b/runtime/compiler/env/j9methodServer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9METHODSERVER_H diff --git a/runtime/compiler/env/jitsupport.cpp b/runtime/compiler/env/jitsupport.cpp index 69dfd97237c..d2430a91c54 100644 --- a/runtime/compiler/env/jitsupport.cpp +++ b/runtime/compiler/env/jitsupport.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/exceptions/AOTFailure.hpp b/runtime/compiler/exceptions/AOTFailure.hpp index c1e2c0f79df..5a437456b68 100644 --- a/runtime/compiler/exceptions/AOTFailure.hpp +++ b/runtime/compiler/exceptions/AOTFailure.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AOT_FAILURE_HPP diff --git a/runtime/compiler/exceptions/DataCacheError.hpp b/runtime/compiler/exceptions/DataCacheError.hpp index ea846b48587..f32351e0b8e 100644 --- a/runtime/compiler/exceptions/DataCacheError.hpp +++ b/runtime/compiler/exceptions/DataCacheError.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DATA_CACHE_ERROR_HPP diff --git a/runtime/compiler/exceptions/FSDFailure.hpp b/runtime/compiler/exceptions/FSDFailure.hpp index b2236f40067..9c9150eaafd 100644 --- a/runtime/compiler/exceptions/FSDFailure.hpp +++ b/runtime/compiler/exceptions/FSDFailure.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FSD_FAILURE_HPP diff --git a/runtime/compiler/exceptions/JITShutDown.hpp b/runtime/compiler/exceptions/JITShutDown.hpp index 13824f0ccf3..72681e459df 100644 --- a/runtime/compiler/exceptions/JITShutDown.hpp +++ b/runtime/compiler/exceptions/JITShutDown.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JIT_SHUTDOWN_HPP diff --git a/runtime/compiler/exceptions/LowPhysicalMemory.hpp b/runtime/compiler/exceptions/LowPhysicalMemory.hpp index 3dbcd638ac3..6ad1108b01f 100644 --- a/runtime/compiler/exceptions/LowPhysicalMemory.hpp +++ b/runtime/compiler/exceptions/LowPhysicalMemory.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LOW_PHYSICAL_MEMORY_HPP diff --git a/runtime/compiler/exceptions/PersistenceFailure.hpp b/runtime/compiler/exceptions/PersistenceFailure.hpp index 52d0a5f3318..0843800f93e 100644 --- a/runtime/compiler/exceptions/PersistenceFailure.hpp +++ b/runtime/compiler/exceptions/PersistenceFailure.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PERSISTENCE_FAILURE diff --git a/runtime/compiler/exceptions/RuntimeFailure.hpp b/runtime/compiler/exceptions/RuntimeFailure.hpp index 9f6800cd4d7..5db4bc22a18 100644 --- a/runtime/compiler/exceptions/RuntimeFailure.hpp +++ b/runtime/compiler/exceptions/RuntimeFailure.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIME_FAILURE diff --git a/runtime/compiler/il/CMakeLists.txt b/runtime/compiler/il/CMakeLists.txt index 431a69603d3..46cb3fafeaf 100644 --- a/runtime/compiler/il/CMakeLists.txt +++ b/runtime/compiler/il/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/il/DataTypes.hpp b/runtime/compiler/il/DataTypes.hpp index 91ec0218898..e025572b664 100644 --- a/runtime/compiler/il/DataTypes.hpp +++ b/runtime/compiler/il/DataTypes.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_DATATYPES_INCL diff --git a/runtime/compiler/il/DataTypesEnum.hpp b/runtime/compiler/il/DataTypesEnum.hpp index a4f60655dc2..d1dcf9842a7 100644 --- a/runtime/compiler/il/DataTypesEnum.hpp +++ b/runtime/compiler/il/DataTypesEnum.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* data types in TR */ diff --git a/runtime/compiler/il/DataTypes_inlines.hpp b/runtime/compiler/il/DataTypes_inlines.hpp index 559c863f1d1..4ba0c9173a7 100644 --- a/runtime/compiler/il/DataTypes_inlines.hpp +++ b/runtime/compiler/il/DataTypes_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DATATYPES_INLINES_INCL diff --git a/runtime/compiler/il/IL.hpp b/runtime/compiler/il/IL.hpp index a4037303f87..6ec42a3f487 100644 --- a/runtime/compiler/il/IL.hpp +++ b/runtime/compiler/il/IL.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_IL_INCL diff --git a/runtime/compiler/il/ILOpCodesEnum.hpp b/runtime/compiler/il/ILOpCodesEnum.hpp index c171e26a4dd..077351ee990 100644 --- a/runtime/compiler/il/ILOpCodesEnum.hpp +++ b/runtime/compiler/il/ILOpCodesEnum.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ILOPCODES_ENUM_INCL diff --git a/runtime/compiler/il/ILOps.hpp b/runtime/compiler/il/ILOps.hpp index e48aee31a3b..0f517d39cea 100644 --- a/runtime/compiler/il/ILOps.hpp +++ b/runtime/compiler/il/ILOps.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILOPS_INCL diff --git a/runtime/compiler/il/ILProps.hpp b/runtime/compiler/il/ILProps.hpp index 73bb03dd040..b04e48b7a79 100644 --- a/runtime/compiler/il/ILProps.hpp +++ b/runtime/compiler/il/ILProps.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ILPROPS_INCL diff --git a/runtime/compiler/il/J9DataTypes.cpp b/runtime/compiler/il/J9DataTypes.cpp index 36171b59af5..35c146b9e61 100644 --- a/runtime/compiler/il/J9DataTypes.cpp +++ b/runtime/compiler/il/J9DataTypes.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/J9DataTypes.hpp" diff --git a/runtime/compiler/il/J9DataTypes.hpp b/runtime/compiler/il/J9DataTypes.hpp index 500b7bcb4de..166337935c2 100644 --- a/runtime/compiler/il/J9DataTypes.hpp +++ b/runtime/compiler/il/J9DataTypes.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_DATATYPE_INCL diff --git a/runtime/compiler/il/J9DataTypes_inlines.hpp b/runtime/compiler/il/J9DataTypes_inlines.hpp index e63ca322296..d6456fff435 100644 --- a/runtime/compiler/il/J9DataTypes_inlines.hpp +++ b/runtime/compiler/il/J9DataTypes_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_DATATYPES_INLINES_INCL diff --git a/runtime/compiler/il/J9IL.cpp b/runtime/compiler/il/J9IL.cpp index da907bb41ef..b216c6bb5be 100644 --- a/runtime/compiler/il/J9IL.cpp +++ b/runtime/compiler/il/J9IL.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/IL.hpp" diff --git a/runtime/compiler/il/J9IL.hpp b/runtime/compiler/il/J9IL.hpp index b826b9220e0..b217e673877 100644 --- a/runtime/compiler/il/J9IL.hpp +++ b/runtime/compiler/il/J9IL.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_IL_INCL diff --git a/runtime/compiler/il/J9ILOps.hpp b/runtime/compiler/il/J9ILOps.hpp index 114c67ff24d..6f515d98a8b 100644 --- a/runtime/compiler/il/J9ILOps.hpp +++ b/runtime/compiler/il/J9ILOps.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ILOPS_INCL diff --git a/runtime/compiler/il/J9MethodSymbol.cpp b/runtime/compiler/il/J9MethodSymbol.cpp index 5426bb4fbdd..64440f24b03 100644 --- a/runtime/compiler/il/J9MethodSymbol.cpp +++ b/runtime/compiler/il/J9MethodSymbol.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/il/J9MethodSymbol.hpp b/runtime/compiler/il/J9MethodSymbol.hpp index 4e9f4bda99f..479d18ed3c0 100644 --- a/runtime/compiler/il/J9MethodSymbol.hpp +++ b/runtime/compiler/il/J9MethodSymbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_METHODSYMBOL_INCL diff --git a/runtime/compiler/il/J9Node.cpp b/runtime/compiler/il/J9Node.cpp index 902b3ec5f81..6724dfe82aa 100644 --- a/runtime/compiler/il/J9Node.cpp +++ b/runtime/compiler/il/J9Node.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/il/J9Node.hpp b/runtime/compiler/il/J9Node.hpp index 0f1fc826b07..938a2874cc6 100644 --- a/runtime/compiler/il/J9Node.hpp +++ b/runtime/compiler/il/J9Node.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_NODE_INCL diff --git a/runtime/compiler/il/J9Node_inlines.hpp b/runtime/compiler/il/J9Node_inlines.hpp index 3f1c4209d80..b5efaebaf50 100644 --- a/runtime/compiler/il/J9Node_inlines.hpp +++ b/runtime/compiler/il/J9Node_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_NODE_INLINES_INCL diff --git a/runtime/compiler/il/J9ResolvedMethodSymbol.cpp b/runtime/compiler/il/J9ResolvedMethodSymbol.cpp index b60084c1326..c73d014481b 100644 --- a/runtime/compiler/il/J9ResolvedMethodSymbol.cpp +++ b/runtime/compiler/il/J9ResolvedMethodSymbol.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/ResolvedMethod.hpp" diff --git a/runtime/compiler/il/J9ResolvedMethodSymbol.hpp b/runtime/compiler/il/J9ResolvedMethodSymbol.hpp index 63c99d7b5db..190ab6bda40 100644 --- a/runtime/compiler/il/J9ResolvedMethodSymbol.hpp +++ b/runtime/compiler/il/J9ResolvedMethodSymbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_RESOLVEDMETHODSYMBOL_INCL diff --git a/runtime/compiler/il/J9StaticSymbol.cpp b/runtime/compiler/il/J9StaticSymbol.cpp index fe5cdee7366..79f344682b9 100644 --- a/runtime/compiler/il/J9StaticSymbol.cpp +++ b/runtime/compiler/il/J9StaticSymbol.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/il/J9StaticSymbol.hpp b/runtime/compiler/il/J9StaticSymbol.hpp index a01318f81e6..7f542dfddd6 100644 --- a/runtime/compiler/il/J9StaticSymbol.hpp +++ b/runtime/compiler/il/J9StaticSymbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_STATICSYMBOL_INCL diff --git a/runtime/compiler/il/J9StaticSymbol_inlines.hpp b/runtime/compiler/il/J9StaticSymbol_inlines.hpp index 38b7b61f4f6..d432496d362 100644 --- a/runtime/compiler/il/J9StaticSymbol_inlines.hpp +++ b/runtime/compiler/il/J9StaticSymbol_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/compiler/il/J9Symbol.cpp b/runtime/compiler/il/J9Symbol.cpp index 6f99103b9a3..09981b2fb9a 100644 --- a/runtime/compiler/il/J9Symbol.cpp +++ b/runtime/compiler/il/J9Symbol.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /************************************************************************** diff --git a/runtime/compiler/il/J9Symbol.hpp b/runtime/compiler/il/J9Symbol.hpp index c0720461b3f..479da9d133a 100644 --- a/runtime/compiler/il/J9Symbol.hpp +++ b/runtime/compiler/il/J9Symbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SYMBOL_INCL diff --git a/runtime/compiler/il/J9SymbolReference.cpp b/runtime/compiler/il/J9SymbolReference.cpp index d3cf32f25a3..fae65fcef94 100644 --- a/runtime/compiler/il/J9SymbolReference.cpp +++ b/runtime/compiler/il/J9SymbolReference.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/J9SymbolReference.hpp" diff --git a/runtime/compiler/il/J9SymbolReference.hpp b/runtime/compiler/il/J9SymbolReference.hpp index a57044ec1b2..79da9b8b974 100644 --- a/runtime/compiler/il/J9SymbolReference.hpp +++ b/runtime/compiler/il/J9SymbolReference.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SYMBOLREFERENCE_INCL diff --git a/runtime/compiler/il/J9Symbol_inlines.hpp b/runtime/compiler/il/J9Symbol_inlines.hpp index 49aaaa5e779..cffae3f9682 100644 --- a/runtime/compiler/il/J9Symbol_inlines.hpp +++ b/runtime/compiler/il/J9Symbol_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SYMBOL_INLINES_INCL diff --git a/runtime/compiler/il/MethodSymbol.hpp b/runtime/compiler/il/MethodSymbol.hpp index cf19da02a5d..411dd697337 100644 --- a/runtime/compiler/il/MethodSymbol.hpp +++ b/runtime/compiler/il/MethodSymbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_METHODSYMBOL_INCL diff --git a/runtime/compiler/il/Node.hpp b/runtime/compiler/il/Node.hpp index ea5c6cc1349..9a6e0aecd60 100644 --- a/runtime/compiler/il/Node.hpp +++ b/runtime/compiler/il/Node.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_NODE_INCL diff --git a/runtime/compiler/il/Node_inlines.hpp b/runtime/compiler/il/Node_inlines.hpp index 13e0a7ca098..3ae6a961f28 100644 --- a/runtime/compiler/il/Node_inlines.hpp +++ b/runtime/compiler/il/Node_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NODE_INLINES_INCL diff --git a/runtime/compiler/il/Opcodes.enum b/runtime/compiler/il/Opcodes.enum index 5c9729c4807..d7d9a3c8e3e 100644 --- a/runtime/compiler/il/Opcodes.enum +++ b/runtime/compiler/il/Opcodes.enum @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/OMROpcodes.enum" diff --git a/runtime/compiler/il/ResolvedMethodSymbol.hpp b/runtime/compiler/il/ResolvedMethodSymbol.hpp index 914f5d58d8a..f3f86fcd87a 100644 --- a/runtime/compiler/il/ResolvedMethodSymbol.hpp +++ b/runtime/compiler/il/ResolvedMethodSymbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RESOLVEDMETHODSYMBOL_INCL diff --git a/runtime/compiler/il/StaticSymbol.hpp b/runtime/compiler/il/StaticSymbol.hpp index b96a50e6aee..b7fcb029e88 100644 --- a/runtime/compiler/il/StaticSymbol.hpp +++ b/runtime/compiler/il/StaticSymbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_STATICSYMBOL_INCL diff --git a/runtime/compiler/il/StaticSymbol_inlines.hpp b/runtime/compiler/il/StaticSymbol_inlines.hpp index 2702671ada4..6249513029d 100644 --- a/runtime/compiler/il/StaticSymbol_inlines.hpp +++ b/runtime/compiler/il/StaticSymbol_inlines.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/compiler/il/Symbol.hpp b/runtime/compiler/il/Symbol.hpp index ab7c4573f34..5cda67ac138 100644 --- a/runtime/compiler/il/Symbol.hpp +++ b/runtime/compiler/il/Symbol.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SYMBOL_INCL diff --git a/runtime/compiler/il/SymbolReference.hpp b/runtime/compiler/il/SymbolReference.hpp index 396696df679..9dc3ce866e6 100644 --- a/runtime/compiler/il/SymbolReference.hpp +++ b/runtime/compiler/il/SymbolReference.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SYMBOLREFERENCE_INCL diff --git a/runtime/compiler/ilgen/CMakeLists.txt b/runtime/compiler/ilgen/CMakeLists.txt index 7bda4298c1e..ec945dc3684 100644 --- a/runtime/compiler/ilgen/CMakeLists.txt +++ b/runtime/compiler/ilgen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/ilgen/ClassLookahead.cpp b/runtime/compiler/ilgen/ClassLookahead.cpp index 7149d2602a7..f02869b326e 100644 --- a/runtime/compiler/ilgen/ClassLookahead.cpp +++ b/runtime/compiler/ilgen/ClassLookahead.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/ClassLookahead.hpp" diff --git a/runtime/compiler/ilgen/ClassLookahead.hpp b/runtime/compiler/ilgen/ClassLookahead.hpp index 8dde2a41af5..f5ce8bbcb59 100644 --- a/runtime/compiler/ilgen/ClassLookahead.hpp +++ b/runtime/compiler/ilgen/ClassLookahead.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ClassLookahead_h diff --git a/runtime/compiler/ilgen/IlGenerator.cpp b/runtime/compiler/ilgen/IlGenerator.cpp index dd753b40fc4..2b359e52eee 100644 --- a/runtime/compiler/ilgen/IlGenerator.cpp +++ b/runtime/compiler/ilgen/IlGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/runtime/compiler/ilgen/IlGeneratorMethodDetails.hpp b/runtime/compiler/ilgen/IlGeneratorMethodDetails.hpp index 6d35bec6b17..13b0834aaa7 100644 --- a/runtime/compiler/ilgen/IlGeneratorMethodDetails.hpp +++ b/runtime/compiler/ilgen/IlGeneratorMethodDetails.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_ILGENERATOR_METHOD_DETAILS_INCL diff --git a/runtime/compiler/ilgen/J9ByteCode.hpp b/runtime/compiler/ilgen/J9ByteCode.hpp index 1bd0b6451d3..e66d614095c 100644 --- a/runtime/compiler/ilgen/J9ByteCode.hpp +++ b/runtime/compiler/ilgen/J9ByteCode.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9BYTECODEENUMS_INCL diff --git a/runtime/compiler/ilgen/J9ByteCodeIlGenerator.hpp b/runtime/compiler/ilgen/J9ByteCodeIlGenerator.hpp index be94ad86a8a..62950e6bc3d 100644 --- a/runtime/compiler/ilgen/J9ByteCodeIlGenerator.hpp +++ b/runtime/compiler/ilgen/J9ByteCodeIlGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IlGenerator_h diff --git a/runtime/compiler/ilgen/J9ByteCodeIterator.cpp b/runtime/compiler/ilgen/J9ByteCodeIterator.cpp index a2a9b386eaa..857d098fe0b 100644 --- a/runtime/compiler/ilgen/J9ByteCodeIterator.cpp +++ b/runtime/compiler/ilgen/J9ByteCodeIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ilgen/J9ByteCodeIterator.hpp" diff --git a/runtime/compiler/ilgen/J9ByteCodeIterator.hpp b/runtime/compiler/ilgen/J9ByteCodeIterator.hpp index 246498497b4..7de54ea0d07 100644 --- a/runtime/compiler/ilgen/J9ByteCodeIterator.hpp +++ b/runtime/compiler/ilgen/J9ByteCodeIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9BYTECODEITERATOR_INCL diff --git a/runtime/compiler/ilgen/J9ByteCodeIteratorWithState.hpp b/runtime/compiler/ilgen/J9ByteCodeIteratorWithState.hpp index 6f681debba5..38cd07d86f9 100644 --- a/runtime/compiler/ilgen/J9ByteCodeIteratorWithState.hpp +++ b/runtime/compiler/ilgen/J9ByteCodeIteratorWithState.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/Flags.hpp" diff --git a/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.cpp b/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.cpp index 71de6ded302..960536ced32 100644 --- a/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.cpp +++ b/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/FrontEnd.hpp" diff --git a/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.hpp b/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.hpp index 3f80ebe9a5d..aa2dd5be1d2 100644 --- a/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.hpp +++ b/runtime/compiler/ilgen/J9IlGeneratorMethodDetails.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ILGENERATOR_METHOD_DETAILS_INCL diff --git a/runtime/compiler/ilgen/Walker.cpp b/runtime/compiler/ilgen/Walker.cpp index aa394dc06af..2ac77567d00 100644 --- a/runtime/compiler/ilgen/Walker.cpp +++ b/runtime/compiler/ilgen/Walker.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/infra/CMakeLists.txt b/runtime/compiler/infra/CMakeLists.txt index d9e8db1f6d6..b6b0bef7fe5 100644 --- a/runtime/compiler/infra/CMakeLists.txt +++ b/runtime/compiler/infra/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/infra/Cfg.hpp b/runtime/compiler/infra/Cfg.hpp index 2551aa3b5eb..e248d21ceb7 100644 --- a/runtime/compiler/infra/Cfg.hpp +++ b/runtime/compiler/infra/Cfg.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CFG_INCL diff --git a/runtime/compiler/infra/J9Cfg.cpp b/runtime/compiler/infra/J9Cfg.cpp index fce3ddf4289..974d3b958b4 100644 --- a/runtime/compiler/infra/J9Cfg.cpp +++ b/runtime/compiler/infra/J9Cfg.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/infra/J9Cfg.hpp b/runtime/compiler/infra/J9Cfg.hpp index 873a404adfa..b7700a93466 100644 --- a/runtime/compiler/infra/J9Cfg.hpp +++ b/runtime/compiler/infra/J9Cfg.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CFG_INCL diff --git a/runtime/compiler/infra/J9Monitor.cpp b/runtime/compiler/infra/J9Monitor.cpp index 64b5def01c0..ec38d08df0e 100644 --- a/runtime/compiler/infra/J9Monitor.cpp +++ b/runtime/compiler/infra/J9Monitor.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/J9Monitor.hpp" diff --git a/runtime/compiler/infra/J9Monitor.hpp b/runtime/compiler/infra/J9Monitor.hpp index 2bf00d0ae0c..8450fe41137 100644 --- a/runtime/compiler/infra/J9Monitor.hpp +++ b/runtime/compiler/infra/J9Monitor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_MONITOR_INCL diff --git a/runtime/compiler/infra/J9MonitorTable.cpp b/runtime/compiler/infra/J9MonitorTable.cpp index f8ae074d73b..f4174b3f863 100644 --- a/runtime/compiler/infra/J9MonitorTable.cpp +++ b/runtime/compiler/infra/J9MonitorTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/MonitorTable.hpp" diff --git a/runtime/compiler/infra/J9MonitorTable.hpp b/runtime/compiler/infra/J9MonitorTable.hpp index d06f3b55351..b62256277ca 100644 --- a/runtime/compiler/infra/J9MonitorTable.hpp +++ b/runtime/compiler/infra/J9MonitorTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRJ9_MONITORTABLE_INCL diff --git a/runtime/compiler/infra/Monitor.hpp b/runtime/compiler/infra/Monitor.hpp index 291db38d858..04c5ee2eddf 100644 --- a/runtime/compiler/infra/Monitor.hpp +++ b/runtime/compiler/infra/Monitor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MONITOR_INCL diff --git a/runtime/compiler/infra/MonitorTable.hpp b/runtime/compiler/infra/MonitorTable.hpp index c9d93453c9d..6b49a153351 100644 --- a/runtime/compiler/infra/MonitorTable.hpp +++ b/runtime/compiler/infra/MonitorTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MONITORTABLE_INCL diff --git a/runtime/compiler/infra/RWMonitor.cpp b/runtime/compiler/infra/RWMonitor.cpp index 00fab141d9b..efc65d1c7bc 100644 --- a/runtime/compiler/infra/RWMonitor.cpp +++ b/runtime/compiler/infra/RWMonitor.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "infra/RWMonitor.hpp" diff --git a/runtime/compiler/infra/RWMonitor.hpp b/runtime/compiler/infra/RWMonitor.hpp index 285698dbb58..56ca20b4355 100644 --- a/runtime/compiler/infra/RWMonitor.hpp +++ b/runtime/compiler/infra/RWMonitor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRJ9_RWMONITOR_INCL diff --git a/runtime/compiler/linter.mk b/runtime/compiler/linter.mk index 3de49a6da3c..7de009c9796 100644 --- a/runtime/compiler/linter.mk +++ b/runtime/compiler/linter.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # To lint: # diff --git a/runtime/compiler/makefile.ftl b/runtime/compiler/makefile.ftl index 3acbc690324..98cd0f11f3b 100644 --- a/runtime/compiler/makefile.ftl +++ b/runtime/compiler/makefile.ftl @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # top-level makefile for J9 JIT diff --git a/runtime/compiler/module.xml b/runtime/compiler/module.xml index 67ec421e2ad..93f65c997e6 100644 --- a/runtime/compiler/module.xml +++ b/runtime/compiler/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/compiler/net/CMakeLists.txt b/runtime/compiler/net/CMakeLists.txt index 20787a6971a..cc8363c6d75 100644 --- a/runtime/compiler/net/CMakeLists.txt +++ b/runtime/compiler/net/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/net/ClientStream.cpp b/runtime/compiler/net/ClientStream.cpp index ef94ccb24a8..f5c076e7cdd 100644 --- a/runtime/compiler/net/ClientStream.cpp +++ b/runtime/compiler/net/ClientStream.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ClientStream.hpp" diff --git a/runtime/compiler/net/ClientStream.hpp b/runtime/compiler/net/ClientStream.hpp index e6f8003d5d6..e720104c09d 100644 --- a/runtime/compiler/net/ClientStream.hpp +++ b/runtime/compiler/net/ClientStream.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLIENT_STREAM_H diff --git a/runtime/compiler/net/CommunicationStream.cpp b/runtime/compiler/net/CommunicationStream.cpp index 9e6ee670981..82a3144ab73 100644 --- a/runtime/compiler/net/CommunicationStream.cpp +++ b/runtime/compiler/net/CommunicationStream.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/CompilationRuntime.hpp" diff --git a/runtime/compiler/net/CommunicationStream.hpp b/runtime/compiler/net/CommunicationStream.hpp index f59d7a5c488..bb1893760af 100644 --- a/runtime/compiler/net/CommunicationStream.hpp +++ b/runtime/compiler/net/CommunicationStream.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMMUNICATION_STREAM_H diff --git a/runtime/compiler/net/LoadSSLLibs.cpp b/runtime/compiler/net/LoadSSLLibs.cpp index fcd10ea1cd8..7f70efa24ac 100644 --- a/runtime/compiler/net/LoadSSLLibs.cpp +++ b/runtime/compiler/net/LoadSSLLibs.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "LoadSSLLibs.hpp" diff --git a/runtime/compiler/net/LoadSSLLibs.hpp b/runtime/compiler/net/LoadSSLLibs.hpp index 3f050c6fd4c..640332244f4 100644 --- a/runtime/compiler/net/LoadSSLLibs.hpp +++ b/runtime/compiler/net/LoadSSLLibs.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LOAD_SSL_LIBS_H #define LOAD_SSL_LIBS_H diff --git a/runtime/compiler/net/Message.cpp b/runtime/compiler/net/Message.cpp index d0d03af201d..40cfc69eb42 100644 --- a/runtime/compiler/net/Message.cpp +++ b/runtime/compiler/net/Message.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "net/Message.hpp" diff --git a/runtime/compiler/net/Message.hpp b/runtime/compiler/net/Message.hpp index 98d4d474f82..4bf4143d9f6 100644 --- a/runtime/compiler/net/Message.hpp +++ b/runtime/compiler/net/Message.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MESSAGE_H diff --git a/runtime/compiler/net/MessageBuffer.cpp b/runtime/compiler/net/MessageBuffer.cpp index 48c8a8930c3..51db259f438 100644 --- a/runtime/compiler/net/MessageBuffer.cpp +++ b/runtime/compiler/net/MessageBuffer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "net/MessageBuffer.hpp" diff --git a/runtime/compiler/net/MessageBuffer.hpp b/runtime/compiler/net/MessageBuffer.hpp index 607f3364011..374e1b9e2e4 100644 --- a/runtime/compiler/net/MessageBuffer.hpp +++ b/runtime/compiler/net/MessageBuffer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MESSAGE_BUFFER_H diff --git a/runtime/compiler/net/MessageTypes.cpp b/runtime/compiler/net/MessageTypes.cpp index eb71132ec7c..98e1bdad7d5 100644 --- a/runtime/compiler/net/MessageTypes.cpp +++ b/runtime/compiler/net/MessageTypes.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "net/MessageTypes.hpp" diff --git a/runtime/compiler/net/MessageTypes.hpp b/runtime/compiler/net/MessageTypes.hpp index 99d2889448a..86b6d4a5833 100644 --- a/runtime/compiler/net/MessageTypes.hpp +++ b/runtime/compiler/net/MessageTypes.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MESSAGE_TYPES_HPP diff --git a/runtime/compiler/net/RawTypeConvert.hpp b/runtime/compiler/net/RawTypeConvert.hpp index 5ed64cefe54..cf5bcd5ad03 100644 --- a/runtime/compiler/net/RawTypeConvert.hpp +++ b/runtime/compiler/net/RawTypeConvert.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RAW_TYPE_CONVERT_H #define RAW_TYPE_CONVERT_H diff --git a/runtime/compiler/net/ServerStream.cpp b/runtime/compiler/net/ServerStream.cpp index 6e698a03630..4c3a8a7c89f 100644 --- a/runtime/compiler/net/ServerStream.cpp +++ b/runtime/compiler/net/ServerStream.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ServerStream.hpp" diff --git a/runtime/compiler/net/ServerStream.hpp b/runtime/compiler/net/ServerStream.hpp index 08d5d604ca3..54a55d561e3 100644 --- a/runtime/compiler/net/ServerStream.hpp +++ b/runtime/compiler/net/ServerStream.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SERVER_STREAM_H diff --git a/runtime/compiler/net/StreamExceptions.hpp b/runtime/compiler/net/StreamExceptions.hpp index 84a256b4b13..421cc5646c4 100644 --- a/runtime/compiler/net/StreamExceptions.hpp +++ b/runtime/compiler/net/StreamExceptions.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STREAM_EXCEPTIONS_H #define STREAM_EXCEPTIONS_H diff --git a/runtime/compiler/optimizer/AllocationSinking.cpp b/runtime/compiler/optimizer/AllocationSinking.cpp index b2c9f841735..2beb4327b3b 100644 --- a/runtime/compiler/optimizer/AllocationSinking.cpp +++ b/runtime/compiler/optimizer/AllocationSinking.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/AllocationSinking.hpp" diff --git a/runtime/compiler/optimizer/AllocationSinking.hpp b/runtime/compiler/optimizer/AllocationSinking.hpp index cffb5a60f55..f0ec2ca7ac0 100644 --- a/runtime/compiler/optimizer/AllocationSinking.hpp +++ b/runtime/compiler/optimizer/AllocationSinking.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ALLOCATIONSINKING_INCL diff --git a/runtime/compiler/optimizer/BoolArrayStoreTransformer.cpp b/runtime/compiler/optimizer/BoolArrayStoreTransformer.cpp index 2112d6c5fde..3484e548388 100644 --- a/runtime/compiler/optimizer/BoolArrayStoreTransformer.cpp +++ b/runtime/compiler/optimizer/BoolArrayStoreTransformer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef J9ZTPF diff --git a/runtime/compiler/optimizer/BoolArrayStoreTransformer.hpp b/runtime/compiler/optimizer/BoolArrayStoreTransformer.hpp index bfb5e16c00a..6a0993401d9 100644 --- a/runtime/compiler/optimizer/BoolArrayStoreTransformer.hpp +++ b/runtime/compiler/optimizer/BoolArrayStoreTransformer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BoolArrayStoreTransformer_h diff --git a/runtime/compiler/optimizer/CFGSimplifier.hpp b/runtime/compiler/optimizer/CFGSimplifier.hpp index 99105c72118..592516e9b7e 100644 --- a/runtime/compiler/optimizer/CFGSimplifier.hpp +++ b/runtime/compiler/optimizer/CFGSimplifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CFGSIMPLIFIER_INCL diff --git a/runtime/compiler/optimizer/CMakeLists.txt b/runtime/compiler/optimizer/CMakeLists.txt index 3b802378478..b7b247d2973 100644 --- a/runtime/compiler/optimizer/CMakeLists.txt +++ b/runtime/compiler/optimizer/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/optimizer/CatchBlockProfiler.cpp b/runtime/compiler/optimizer/CatchBlockProfiler.cpp index 518438f46ee..6c0cc5ba7b6 100644 --- a/runtime/compiler/optimizer/CatchBlockProfiler.cpp +++ b/runtime/compiler/optimizer/CatchBlockProfiler.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] http://openjdk.java.net/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/optimizer/CatchBlockProfiler.hpp b/runtime/compiler/optimizer/CatchBlockProfiler.hpp index 8ed94b8085a..7b06308e372 100644 --- a/runtime/compiler/optimizer/CatchBlockProfiler.hpp +++ b/runtime/compiler/optimizer/CatchBlockProfiler.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] http://openjdk.java.net/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CATCHBLOCKPROFILER_INCL diff --git a/runtime/compiler/optimizer/DataAccessAccelerator.cpp b/runtime/compiler/optimizer/DataAccessAccelerator.cpp index 450a10e5731..45857a25600 100644 --- a/runtime/compiler/optimizer/DataAccessAccelerator.cpp +++ b/runtime/compiler/optimizer/DataAccessAccelerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DataAccessAccelerator.hpp" diff --git a/runtime/compiler/optimizer/DataAccessAccelerator.hpp b/runtime/compiler/optimizer/DataAccessAccelerator.hpp index ff324ebba8e..51045b78d9c 100644 --- a/runtime/compiler/optimizer/DataAccessAccelerator.hpp +++ b/runtime/compiler/optimizer/DataAccessAccelerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DATAACCESSACCELERATOR_INCL diff --git a/runtime/compiler/optimizer/DataFlowAnalysis.enum b/runtime/compiler/optimizer/DataFlowAnalysis.enum index d9632fd6386..ad0ae581f97 100644 --- a/runtime/compiler/optimizer/DataFlowAnalysis.enum +++ b/runtime/compiler/optimizer/DataFlowAnalysis.enum @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/optimizer/DynamicLiteralPool.cpp b/runtime/compiler/optimizer/DynamicLiteralPool.cpp index 0a0c4efbf11..3f3fc8786a9 100644 --- a/runtime/compiler/optimizer/DynamicLiteralPool.cpp +++ b/runtime/compiler/optimizer/DynamicLiteralPool.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DynamicLiteralPool.hpp" diff --git a/runtime/compiler/optimizer/DynamicLiteralPool.hpp b/runtime/compiler/optimizer/DynamicLiteralPool.hpp index 8c6d635e478..13c1fed18e0 100644 --- a/runtime/compiler/optimizer/DynamicLiteralPool.hpp +++ b/runtime/compiler/optimizer/DynamicLiteralPool.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DYNAMICLITERALPOOL_INCL diff --git a/runtime/compiler/optimizer/EscapeAnalysis.cpp b/runtime/compiler/optimizer/EscapeAnalysis.cpp index be26879ae00..a4c1b7f34d0 100644 --- a/runtime/compiler/optimizer/EscapeAnalysis.cpp +++ b/runtime/compiler/optimizer/EscapeAnalysis.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef J9ZTPF diff --git a/runtime/compiler/optimizer/EscapeAnalysis.hpp b/runtime/compiler/optimizer/EscapeAnalysis.hpp index 5859d628a44..ecf848da334 100644 --- a/runtime/compiler/optimizer/EscapeAnalysis.hpp +++ b/runtime/compiler/optimizer/EscapeAnalysis.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ESCAPEANALYSIS_INCL diff --git a/runtime/compiler/optimizer/EscapeAnalysisTools.cpp b/runtime/compiler/optimizer/EscapeAnalysisTools.cpp index 0505c3e3799..fe3c68ccbc8 100644 --- a/runtime/compiler/optimizer/EscapeAnalysisTools.cpp +++ b/runtime/compiler/optimizer/EscapeAnalysisTools.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/EscapeAnalysisTools.hpp" diff --git a/runtime/compiler/optimizer/EscapeAnalysisTools.hpp b/runtime/compiler/optimizer/EscapeAnalysisTools.hpp index 6a3c3161825..96298160d18 100644 --- a/runtime/compiler/optimizer/EscapeAnalysisTools.hpp +++ b/runtime/compiler/optimizer/EscapeAnalysisTools.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ESCAPEANALYSISTOOLS_INCL diff --git a/runtime/compiler/optimizer/EstimateCodeSize.cpp b/runtime/compiler/optimizer/EstimateCodeSize.cpp index 59c036f26a7..3df868ad30c 100644 --- a/runtime/compiler/optimizer/EstimateCodeSize.cpp +++ b/runtime/compiler/optimizer/EstimateCodeSize.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/StackMemoryRegion.hpp" diff --git a/runtime/compiler/optimizer/EstimateCodeSize.hpp b/runtime/compiler/optimizer/EstimateCodeSize.hpp index 3c4c019f3cc..04dba7a5203 100644 --- a/runtime/compiler/optimizer/EstimateCodeSize.hpp +++ b/runtime/compiler/optimizer/EstimateCodeSize.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ESTIMATECS_INCL diff --git a/runtime/compiler/optimizer/FearPointAnalysis.cpp b/runtime/compiler/optimizer/FearPointAnalysis.cpp index c4b840c8eee..f2be1ff4c02 100644 --- a/runtime/compiler/optimizer/FearPointAnalysis.cpp +++ b/runtime/compiler/optimizer/FearPointAnalysis.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/compiler/optimizer/FearPointAnalysis.hpp b/runtime/compiler/optimizer/FearPointAnalysis.hpp index 20709466cb9..558b08a5c20 100644 --- a/runtime/compiler/optimizer/FearPointAnalysis.hpp +++ b/runtime/compiler/optimizer/FearPointAnalysis.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DataFlowAnalysis.hpp" diff --git a/runtime/compiler/optimizer/HCRGuardAnalysis.cpp b/runtime/compiler/optimizer/HCRGuardAnalysis.cpp index 3e0e7bfc12e..4cd9147e45c 100644 --- a/runtime/compiler/optimizer/HCRGuardAnalysis.cpp +++ b/runtime/compiler/optimizer/HCRGuardAnalysis.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/compiler/optimizer/HCRGuardAnalysis.hpp b/runtime/compiler/optimizer/HCRGuardAnalysis.hpp index 12ee0d8dce8..7825fab62d2 100644 --- a/runtime/compiler/optimizer/HCRGuardAnalysis.hpp +++ b/runtime/compiler/optimizer/HCRGuardAnalysis.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/DataFlowAnalysis.hpp" diff --git a/runtime/compiler/optimizer/HandleRecompilationOps.cpp b/runtime/compiler/optimizer/HandleRecompilationOps.cpp index 8bd179678b3..4fd68ebc80b 100644 --- a/runtime/compiler/optimizer/HandleRecompilationOps.cpp +++ b/runtime/compiler/optimizer/HandleRecompilationOps.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/HandleRecompilationOps.hpp" diff --git a/runtime/compiler/optimizer/HandleRecompilationOps.hpp b/runtime/compiler/optimizer/HandleRecompilationOps.hpp index 123d8c80f3a..33e2dcd1bff 100644 --- a/runtime/compiler/optimizer/HandleRecompilationOps.hpp +++ b/runtime/compiler/optimizer/HandleRecompilationOps.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HANDLERECOMPILATINOOPS_INCL diff --git a/runtime/compiler/optimizer/HotFieldMarking.cpp b/runtime/compiler/optimizer/HotFieldMarking.cpp index 1cd87e58d18..38b226fe021 100644 --- a/runtime/compiler/optimizer/HotFieldMarking.cpp +++ b/runtime/compiler/optimizer/HotFieldMarking.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/HotFieldMarking.hpp" diff --git a/runtime/compiler/optimizer/HotFieldMarking.hpp b/runtime/compiler/optimizer/HotFieldMarking.hpp index 11c489f57fa..b229b6928a0 100644 --- a/runtime/compiler/optimizer/HotFieldMarking.hpp +++ b/runtime/compiler/optimizer/HotFieldMarking.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HOTFIELDMARKING_INCL diff --git a/runtime/compiler/optimizer/IdiomRecognition.cpp b/runtime/compiler/optimizer/IdiomRecognition.cpp index ca2ab1eb46f..c562e4468da 100644 --- a/runtime/compiler/optimizer/IdiomRecognition.cpp +++ b/runtime/compiler/optimizer/IdiomRecognition.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/IdiomRecognition.hpp" diff --git a/runtime/compiler/optimizer/IdiomRecognition.hpp b/runtime/compiler/optimizer/IdiomRecognition.hpp index 8c700fdc3c9..a1a075acfd2 100644 --- a/runtime/compiler/optimizer/IdiomRecognition.hpp +++ b/runtime/compiler/optimizer/IdiomRecognition.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IDIOMRECOGNITION_INCL diff --git a/runtime/compiler/optimizer/IdiomRecognitionUtils.cpp b/runtime/compiler/optimizer/IdiomRecognitionUtils.cpp index 67585bfe560..0cc1e4d91fb 100644 --- a/runtime/compiler/optimizer/IdiomRecognitionUtils.cpp +++ b/runtime/compiler/optimizer/IdiomRecognitionUtils.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/IdiomRecognitionUtils.hpp" diff --git a/runtime/compiler/optimizer/IdiomRecognitionUtils.hpp b/runtime/compiler/optimizer/IdiomRecognitionUtils.hpp index a0dbd2c2492..d566197376b 100644 --- a/runtime/compiler/optimizer/IdiomRecognitionUtils.hpp +++ b/runtime/compiler/optimizer/IdiomRecognitionUtils.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IDIOM_RECOGNITION_UTILS_INCL diff --git a/runtime/compiler/optimizer/IdiomTransformations.cpp b/runtime/compiler/optimizer/IdiomTransformations.cpp index b8c7b3979ca..2402b6fa1e7 100644 --- a/runtime/compiler/optimizer/IdiomTransformations.cpp +++ b/runtime/compiler/optimizer/IdiomTransformations.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/optimizer/InlinerTempForJ9.cpp b/runtime/compiler/optimizer/InlinerTempForJ9.cpp index 71b0df4d41d..a3d4551f008 100644 --- a/runtime/compiler/optimizer/InlinerTempForJ9.cpp +++ b/runtime/compiler/optimizer/InlinerTempForJ9.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include "j9cfg.h" diff --git a/runtime/compiler/optimizer/InterProceduralAnalyzer.cpp b/runtime/compiler/optimizer/InterProceduralAnalyzer.cpp index 01078fed5b8..311028fe9a0 100644 --- a/runtime/compiler/optimizer/InterProceduralAnalyzer.cpp +++ b/runtime/compiler/optimizer/InterProceduralAnalyzer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/InterProceduralAnalyzer.hpp" diff --git a/runtime/compiler/optimizer/InterProceduralAnalyzer.hpp b/runtime/compiler/optimizer/InterProceduralAnalyzer.hpp index aa3d4ae00bc..d90fdb286a1 100644 --- a/runtime/compiler/optimizer/InterProceduralAnalyzer.hpp +++ b/runtime/compiler/optimizer/InterProceduralAnalyzer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IPA_h diff --git a/runtime/compiler/optimizer/InterpreterEmulator.cpp b/runtime/compiler/optimizer/InterpreterEmulator.cpp index 83d6cd33dd5..5399a204f04 100644 --- a/runtime/compiler/optimizer/InterpreterEmulator.cpp +++ b/runtime/compiler/optimizer/InterpreterEmulator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/InterpreterEmulator.hpp" #include "optimizer/J9EstimateCodeSize.hpp" diff --git a/runtime/compiler/optimizer/InterpreterEmulator.hpp b/runtime/compiler/optimizer/InterpreterEmulator.hpp index b2045549b64..29eca8efa6c 100644 --- a/runtime/compiler/optimizer/InterpreterEmulator.hpp +++ b/runtime/compiler/optimizer/InterpreterEmulator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/optimizer/J9CFGSimplifier.cpp b/runtime/compiler/optimizer/J9CFGSimplifier.cpp index a3a97b07987..daa9c96f9a5 100644 --- a/runtime/compiler/optimizer/J9CFGSimplifier.cpp +++ b/runtime/compiler/optimizer/J9CFGSimplifier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Method.hpp" diff --git a/runtime/compiler/optimizer/J9CFGSimplifier.hpp b/runtime/compiler/optimizer/J9CFGSimplifier.hpp index 65bdd94ada8..8c87c94ec40 100644 --- a/runtime/compiler/optimizer/J9CFGSimplifier.hpp +++ b/runtime/compiler/optimizer/J9CFGSimplifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CFGSIMPLIFIER_INCL diff --git a/runtime/compiler/optimizer/J9CallGraph.hpp b/runtime/compiler/optimizer/J9CallGraph.hpp index a7d236a10f5..85e3d24e087 100644 --- a/runtime/compiler/optimizer/J9CallGraph.hpp +++ b/runtime/compiler/optimizer/J9CallGraph.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/CallInfo.hpp" diff --git a/runtime/compiler/optimizer/J9EstimateCodeSize.cpp b/runtime/compiler/optimizer/J9EstimateCodeSize.cpp index 2f47b9bc0d5..12c834e4cfb 100644 --- a/runtime/compiler/optimizer/J9EstimateCodeSize.cpp +++ b/runtime/compiler/optimizer/J9EstimateCodeSize.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/optimizer/J9EstimateCodeSize.hpp b/runtime/compiler/optimizer/J9EstimateCodeSize.hpp index a73cd711c36..50cd7cf6e23 100644 --- a/runtime/compiler/optimizer/J9EstimateCodeSize.hpp +++ b/runtime/compiler/optimizer/J9EstimateCodeSize.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ESTIMATECS_INCL diff --git a/runtime/compiler/optimizer/J9Inliner.cpp b/runtime/compiler/optimizer/J9Inliner.cpp index 9d69217f69f..a7dc19ec53e 100644 --- a/runtime/compiler/optimizer/J9Inliner.cpp +++ b/runtime/compiler/optimizer/J9Inliner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/Inliner.hpp" diff --git a/runtime/compiler/optimizer/J9Inliner.hpp b/runtime/compiler/optimizer/J9Inliner.hpp index 185335f9e4c..afb6fb53b82 100644 --- a/runtime/compiler/optimizer/J9Inliner.hpp +++ b/runtime/compiler/optimizer/J9Inliner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef INLINERTEMPFORJ9_INCL diff --git a/runtime/compiler/optimizer/J9LocalCSE.cpp b/runtime/compiler/optimizer/J9LocalCSE.cpp index e9dee581ea0..e10528f86cf 100644 --- a/runtime/compiler/optimizer/J9LocalCSE.cpp +++ b/runtime/compiler/optimizer/J9LocalCSE.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/VMJ9.h" diff --git a/runtime/compiler/optimizer/J9LocalCSE.hpp b/runtime/compiler/optimizer/J9LocalCSE.hpp index 10d8e1cd05a..1062dec9033 100644 --- a/runtime/compiler/optimizer/J9LocalCSE.hpp +++ b/runtime/compiler/optimizer/J9LocalCSE.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_LOCALCSE_INCL diff --git a/runtime/compiler/optimizer/J9Optimization.hpp b/runtime/compiler/optimizer/J9Optimization.hpp index ba5b9587461..83a3551a080 100644 --- a/runtime/compiler/optimizer/J9Optimization.hpp +++ b/runtime/compiler/optimizer/J9Optimization.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_OPTIMIZATION_INCL diff --git a/runtime/compiler/optimizer/J9OptimizationManager.cpp b/runtime/compiler/optimizer/J9OptimizationManager.cpp index 7cf685f7098..025564d9b0c 100644 --- a/runtime/compiler/optimizer/J9OptimizationManager.cpp +++ b/runtime/compiler/optimizer/J9OptimizationManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OptimizationManager.hpp" diff --git a/runtime/compiler/optimizer/J9OptimizationManager.hpp b/runtime/compiler/optimizer/J9OptimizationManager.hpp index f202f9d50e8..acdebeb213a 100644 --- a/runtime/compiler/optimizer/J9OptimizationManager.hpp +++ b/runtime/compiler/optimizer/J9OptimizationManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_OPTIMIZATIONMANAGER_INCL diff --git a/runtime/compiler/optimizer/J9Optimizer.cpp b/runtime/compiler/optimizer/J9Optimizer.cpp index baf0f0137b8..7fa58dd1f95 100644 --- a/runtime/compiler/optimizer/J9Optimizer.cpp +++ b/runtime/compiler/optimizer/J9Optimizer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) diff --git a/runtime/compiler/optimizer/J9Optimizer.hpp b/runtime/compiler/optimizer/J9Optimizer.hpp index 1d44170c652..456b5d73a96 100644 --- a/runtime/compiler/optimizer/J9Optimizer.hpp +++ b/runtime/compiler/optimizer/J9Optimizer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_OPTIMIZER_INCL diff --git a/runtime/compiler/optimizer/J9RecognizedCallTransformer.cpp b/runtime/compiler/optimizer/J9RecognizedCallTransformer.cpp index aaca3135f4e..e6f9957bc6a 100644 --- a/runtime/compiler/optimizer/J9RecognizedCallTransformer.cpp +++ b/runtime/compiler/optimizer/J9RecognizedCallTransformer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/RecognizedCallTransformer.hpp" diff --git a/runtime/compiler/optimizer/J9RecognizedCallTransformer.hpp b/runtime/compiler/optimizer/J9RecognizedCallTransformer.hpp index f75847c5d24..d991f3158cc 100644 --- a/runtime/compiler/optimizer/J9RecognizedCallTransformer.hpp +++ b/runtime/compiler/optimizer/J9RecognizedCallTransformer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9RECOGNIZEDCALLTRANSFORMER_INCL diff --git a/runtime/compiler/optimizer/J9Simplifier.cpp b/runtime/compiler/optimizer/J9Simplifier.cpp index 39a8318e838..9a7399b7c0e 100644 --- a/runtime/compiler/optimizer/J9Simplifier.cpp +++ b/runtime/compiler/optimizer/J9Simplifier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrport.h" diff --git a/runtime/compiler/optimizer/J9Simplifier.hpp b/runtime/compiler/optimizer/J9Simplifier.hpp index 748d9b7d730..a8a065da459 100644 --- a/runtime/compiler/optimizer/J9Simplifier.hpp +++ b/runtime/compiler/optimizer/J9Simplifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SIMPLIFIER_INCL diff --git a/runtime/compiler/optimizer/J9SimplifierHandlers.cpp b/runtime/compiler/optimizer/J9SimplifierHandlers.cpp index c1fcae0834d..a4577d9b7aa 100644 --- a/runtime/compiler/optimizer/J9SimplifierHandlers.cpp +++ b/runtime/compiler/optimizer/J9SimplifierHandlers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OMRSimplifierHelpers.hpp" diff --git a/runtime/compiler/optimizer/J9SimplifierHandlers.hpp b/runtime/compiler/optimizer/J9SimplifierHandlers.hpp index a6f5a14c08d..07aedb12c7c 100644 --- a/runtime/compiler/optimizer/J9SimplifierHandlers.hpp +++ b/runtime/compiler/optimizer/J9SimplifierHandlers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SIMPLIFIERHANDLERS_INCL diff --git a/runtime/compiler/optimizer/J9SimplifierHelpers.cpp b/runtime/compiler/optimizer/J9SimplifierHelpers.cpp index 6269dcb26ac..ab777c9dced 100644 --- a/runtime/compiler/optimizer/J9SimplifierHelpers.cpp +++ b/runtime/compiler/optimizer/J9SimplifierHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/J9SimplifierHelpers.hpp" diff --git a/runtime/compiler/optimizer/J9SimplifierHelpers.hpp b/runtime/compiler/optimizer/J9SimplifierHelpers.hpp index f2bc2000b38..b5519c5fe95 100644 --- a/runtime/compiler/optimizer/J9SimplifierHelpers.hpp +++ b/runtime/compiler/optimizer/J9SimplifierHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SIMPLIFIERHELPERS_INCL diff --git a/runtime/compiler/optimizer/J9SimplifierTable.enum b/runtime/compiler/optimizer/J9SimplifierTable.enum index f734ee702a2..dcebe11957d 100644 --- a/runtime/compiler/optimizer/J9SimplifierTable.enum +++ b/runtime/compiler/optimizer/J9SimplifierTable.enum @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_SIMPLIFIERTABLE_ENUM_INCL diff --git a/runtime/compiler/optimizer/J9TransformUtil.cpp b/runtime/compiler/optimizer/J9TransformUtil.cpp index b2d396c06bb..15cac08c994 100644 --- a/runtime/compiler/optimizer/J9TransformUtil.cpp +++ b/runtime/compiler/optimizer/J9TransformUtil.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/TransformUtil.hpp" diff --git a/runtime/compiler/optimizer/J9TransformUtil.hpp b/runtime/compiler/optimizer/J9TransformUtil.hpp index b20c97c0c15..b7a8e2a5d30 100644 --- a/runtime/compiler/optimizer/J9TransformUtil.hpp +++ b/runtime/compiler/optimizer/J9TransformUtil.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_TRANSFORMUTIL_INCL diff --git a/runtime/compiler/optimizer/J9ValuePropagation.cpp b/runtime/compiler/optimizer/J9ValuePropagation.cpp index 6fd14577e45..a97653eeab3 100644 --- a/runtime/compiler/optimizer/J9ValuePropagation.cpp +++ b/runtime/compiler/optimizer/J9ValuePropagation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/J9ValuePropagation.hpp" diff --git a/runtime/compiler/optimizer/J9ValuePropagation.hpp b/runtime/compiler/optimizer/J9ValuePropagation.hpp index 34c4c42434d..97bbd5ed006 100644 --- a/runtime/compiler/optimizer/J9ValuePropagation.hpp +++ b/runtime/compiler/optimizer/J9ValuePropagation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_VALUEPROPAGATION_INCL diff --git a/runtime/compiler/optimizer/JProfilingBlock.cpp b/runtime/compiler/optimizer/JProfilingBlock.cpp index 58c6f85e5ef..73d72e4dc9c 100644 --- a/runtime/compiler/optimizer/JProfilingBlock.cpp +++ b/runtime/compiler/optimizer/JProfilingBlock.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JProfilingBlock.hpp" diff --git a/runtime/compiler/optimizer/JProfilingBlock.hpp b/runtime/compiler/optimizer/JProfilingBlock.hpp index b86aa2d74f0..5ba746a8c1d 100644 --- a/runtime/compiler/optimizer/JProfilingBlock.hpp +++ b/runtime/compiler/optimizer/JProfilingBlock.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JPROFILINGBLOCK_INCL #define JPROFILINGBLOCK_INCL diff --git a/runtime/compiler/optimizer/JProfilingRecompLoopTest.cpp b/runtime/compiler/optimizer/JProfilingRecompLoopTest.cpp index 542f87be7e0..6241a923c60 100644 --- a/runtime/compiler/optimizer/JProfilingRecompLoopTest.cpp +++ b/runtime/compiler/optimizer/JProfilingRecompLoopTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JProfilingRecompLoopTest.hpp" #include "il/Block.hpp" diff --git a/runtime/compiler/optimizer/JProfilingRecompLoopTest.hpp b/runtime/compiler/optimizer/JProfilingRecompLoopTest.hpp index ff073dd4e65..dc856724a7c 100644 --- a/runtime/compiler/optimizer/JProfilingRecompLoopTest.hpp +++ b/runtime/compiler/optimizer/JProfilingRecompLoopTest.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include "optimizer/Optimization.hpp" diff --git a/runtime/compiler/optimizer/JProfilingValue.cpp b/runtime/compiler/optimizer/JProfilingValue.cpp index b015ab86d29..95db0451f9d 100644 --- a/runtime/compiler/optimizer/JProfilingValue.cpp +++ b/runtime/compiler/optimizer/JProfilingValue.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JProfilingValue.hpp" diff --git a/runtime/compiler/optimizer/JProfilingValue.hpp b/runtime/compiler/optimizer/JProfilingValue.hpp index 8394a3f0f2a..0a4355bf6f7 100644 --- a/runtime/compiler/optimizer/JProfilingValue.hpp +++ b/runtime/compiler/optimizer/JProfilingValue.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JPROFILINGVALUE_INCL #define JPROFILINGVALUE_INCL diff --git a/runtime/compiler/optimizer/JitProfiler.cpp b/runtime/compiler/optimizer/JitProfiler.cpp index 8d0ecc0d865..d345e440b81 100644 --- a/runtime/compiler/optimizer/JitProfiler.cpp +++ b/runtime/compiler/optimizer/JitProfiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/JitProfiler.hpp" diff --git a/runtime/compiler/optimizer/JitProfiler.hpp b/runtime/compiler/optimizer/JitProfiler.hpp index 8e0d657b16f..f13fdd3cbea 100644 --- a/runtime/compiler/optimizer/JitProfiler.hpp +++ b/runtime/compiler/optimizer/JitProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITPROFILER_INCL diff --git a/runtime/compiler/optimizer/LiveVariablesForGC.cpp b/runtime/compiler/optimizer/LiveVariablesForGC.cpp index d31760c4fb8..421b1ec0255 100644 --- a/runtime/compiler/optimizer/LiveVariablesForGC.cpp +++ b/runtime/compiler/optimizer/LiveVariablesForGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LiveVariablesForGC.hpp" diff --git a/runtime/compiler/optimizer/LiveVariablesForGC.hpp b/runtime/compiler/optimizer/LiveVariablesForGC.hpp index 0972ee48519..4d6056aaad1 100644 --- a/runtime/compiler/optimizer/LiveVariablesForGC.hpp +++ b/runtime/compiler/optimizer/LiveVariablesForGC.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LIVEVARS_INCL diff --git a/runtime/compiler/optimizer/LocalCSE.hpp b/runtime/compiler/optimizer/LocalCSE.hpp index 6a0b7c6a423..0dc488bff41 100644 --- a/runtime/compiler/optimizer/LocalCSE.hpp +++ b/runtime/compiler/optimizer/LocalCSE.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LOCALCSE_INCL diff --git a/runtime/compiler/optimizer/LoopAliasRefiner.cpp b/runtime/compiler/optimizer/LoopAliasRefiner.cpp index 6256d5c4089..ae4a97f6bbd 100644 --- a/runtime/compiler/optimizer/LoopAliasRefiner.cpp +++ b/runtime/compiler/optimizer/LoopAliasRefiner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/LoopAliasRefiner.hpp" diff --git a/runtime/compiler/optimizer/LoopAliasRefiner.hpp b/runtime/compiler/optimizer/LoopAliasRefiner.hpp index ac4269c8c9a..582e1c8ff32 100644 --- a/runtime/compiler/optimizer/LoopAliasRefiner.hpp +++ b/runtime/compiler/optimizer/LoopAliasRefiner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LOOPALIASREFINER_INCL diff --git a/runtime/compiler/optimizer/MethodHandleTransformer.cpp b/runtime/compiler/optimizer/MethodHandleTransformer.cpp index a05176059d8..48b0fcc1b29 100644 --- a/runtime/compiler/optimizer/MethodHandleTransformer.cpp +++ b/runtime/compiler/optimizer/MethodHandleTransformer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/MethodHandleTransformer.hpp" diff --git a/runtime/compiler/optimizer/MethodHandleTransformer.hpp b/runtime/compiler/optimizer/MethodHandleTransformer.hpp index 5178aa18bf8..bee4dfb3af5 100644 --- a/runtime/compiler/optimizer/MethodHandleTransformer.hpp +++ b/runtime/compiler/optimizer/MethodHandleTransformer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef METHODHANDLETRANSFORMER_INCL diff --git a/runtime/compiler/optimizer/MonitorElimination.cpp b/runtime/compiler/optimizer/MonitorElimination.cpp index 8d5f167f07e..30ec98a4c53 100644 --- a/runtime/compiler/optimizer/MonitorElimination.cpp +++ b/runtime/compiler/optimizer/MonitorElimination.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/MonitorElimination.hpp" diff --git a/runtime/compiler/optimizer/MonitorElimination.hpp b/runtime/compiler/optimizer/MonitorElimination.hpp index e25c352ac4d..7ff5bb26f83 100644 --- a/runtime/compiler/optimizer/MonitorElimination.hpp +++ b/runtime/compiler/optimizer/MonitorElimination.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef MONITORELIM_INCL diff --git a/runtime/compiler/optimizer/NewInitialization.cpp b/runtime/compiler/optimizer/NewInitialization.cpp index b7e615ebc10..d0cce1e8e2b 100644 --- a/runtime/compiler/optimizer/NewInitialization.cpp +++ b/runtime/compiler/optimizer/NewInitialization.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/NewInitialization.hpp" diff --git a/runtime/compiler/optimizer/NewInitialization.hpp b/runtime/compiler/optimizer/NewInitialization.hpp index cf6f7779a13..f916658dbab 100644 --- a/runtime/compiler/optimizer/NewInitialization.hpp +++ b/runtime/compiler/optimizer/NewInitialization.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef NEWINITIALIZATION_INCL diff --git a/runtime/compiler/optimizer/OSRGuardAnalysis.cpp b/runtime/compiler/optimizer/OSRGuardAnalysis.cpp index 6caea5fc386..a03aae602de 100644 --- a/runtime/compiler/optimizer/OSRGuardAnalysis.cpp +++ b/runtime/compiler/optimizer/OSRGuardAnalysis.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OSRGuardAnalysis.hpp" diff --git a/runtime/compiler/optimizer/OSRGuardAnalysis.hpp b/runtime/compiler/optimizer/OSRGuardAnalysis.hpp index 5bc7d629e85..556389d0872 100644 --- a/runtime/compiler/optimizer/OSRGuardAnalysis.hpp +++ b/runtime/compiler/optimizer/OSRGuardAnalysis.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OSRGUARDANALYSIS_INCL #define OSRGUARDANALYSIS_INCL diff --git a/runtime/compiler/optimizer/OSRGuardInsertion.cpp b/runtime/compiler/optimizer/OSRGuardInsertion.cpp index fffa1112caf..a7322dcc8a3 100644 --- a/runtime/compiler/optimizer/OSRGuardInsertion.cpp +++ b/runtime/compiler/optimizer/OSRGuardInsertion.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OSRGuardInsertion.hpp" diff --git a/runtime/compiler/optimizer/OSRGuardInsertion.hpp b/runtime/compiler/optimizer/OSRGuardInsertion.hpp index e682ff2e4db..49709f5fdb4 100644 --- a/runtime/compiler/optimizer/OSRGuardInsertion.hpp +++ b/runtime/compiler/optimizer/OSRGuardInsertion.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OSRGUARDINSERTION_INCL #define OSRGUARDINSERTION_INCL diff --git a/runtime/compiler/optimizer/OSRGuardRemoval.cpp b/runtime/compiler/optimizer/OSRGuardRemoval.cpp index 3b8bbbaabb7..dfd3c8920df 100644 --- a/runtime/compiler/optimizer/OSRGuardRemoval.cpp +++ b/runtime/compiler/optimizer/OSRGuardRemoval.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/OSRGuardRemoval.hpp" diff --git a/runtime/compiler/optimizer/OSRGuardRemoval.hpp b/runtime/compiler/optimizer/OSRGuardRemoval.hpp index ca68152d035..0b102aae633 100644 --- a/runtime/compiler/optimizer/OSRGuardRemoval.hpp +++ b/runtime/compiler/optimizer/OSRGuardRemoval.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OSRGUARDREMOVAL_INCL #define OSRGUARDREMOVAL_INCL diff --git a/runtime/compiler/optimizer/Optimization.hpp b/runtime/compiler/optimizer/Optimization.hpp index 193c380ed6f..5dff4c160f7 100644 --- a/runtime/compiler/optimizer/Optimization.hpp +++ b/runtime/compiler/optimizer/Optimization.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATION_INCL diff --git a/runtime/compiler/optimizer/OptimizationGroups.enum b/runtime/compiler/optimizer/OptimizationGroups.enum index cd2ff3b4c49..7d069bb7292 100644 --- a/runtime/compiler/optimizer/OptimizationGroups.enum +++ b/runtime/compiler/optimizer/OptimizationGroups.enum @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/optimizer/OptimizationManager.hpp b/runtime/compiler/optimizer/OptimizationManager.hpp index 7b088de2800..a0feb1bb6dc 100644 --- a/runtime/compiler/optimizer/OptimizationManager.hpp +++ b/runtime/compiler/optimizer/OptimizationManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZATIONMANAGER_INCL diff --git a/runtime/compiler/optimizer/Optimizations.enum b/runtime/compiler/optimizer/Optimizations.enum index 20a28c43304..1f42adef517 100644 --- a/runtime/compiler/optimizer/Optimizations.enum +++ b/runtime/compiler/optimizer/Optimizations.enum @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/optimizer/Optimizer.hpp b/runtime/compiler/optimizer/Optimizer.hpp index 7572e518f60..3383fe4c192 100644 --- a/runtime/compiler/optimizer/Optimizer.hpp +++ b/runtime/compiler/optimizer/Optimizer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_OPTIMIZER_INCL diff --git a/runtime/compiler/optimizer/PostEscapeAnalysis.cpp b/runtime/compiler/optimizer/PostEscapeAnalysis.cpp index 701205ec93d..3366d23aae9 100644 --- a/runtime/compiler/optimizer/PostEscapeAnalysis.cpp +++ b/runtime/compiler/optimizer/PostEscapeAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "il/Block.hpp" diff --git a/runtime/compiler/optimizer/PostEscapeAnalysis.hpp b/runtime/compiler/optimizer/PostEscapeAnalysis.hpp index 3860451ab20..eca56fbe688 100644 --- a/runtime/compiler/optimizer/PostEscapeAnalysis.hpp +++ b/runtime/compiler/optimizer/PostEscapeAnalysis.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VIRTUALGUARDHEADMERGER_INCL diff --git a/runtime/compiler/optimizer/PreEscapeAnalysis.cpp b/runtime/compiler/optimizer/PreEscapeAnalysis.cpp index ac6b7b69949..1b9dc2576d1 100644 --- a/runtime/compiler/optimizer/PreEscapeAnalysis.cpp +++ b/runtime/compiler/optimizer/PreEscapeAnalysis.cpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/PreEscapeAnalysis.hpp" diff --git a/runtime/compiler/optimizer/PreEscapeAnalysis.hpp b/runtime/compiler/optimizer/PreEscapeAnalysis.hpp index bccb63947df..4f0a50c1440 100644 --- a/runtime/compiler/optimizer/PreEscapeAnalysis.hpp +++ b/runtime/compiler/optimizer/PreEscapeAnalysis.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PREESCAPEANALYSIS_INCL diff --git a/runtime/compiler/optimizer/ProfileGenerator.cpp b/runtime/compiler/optimizer/ProfileGenerator.cpp index 7149db09fc4..ad4af577e96 100644 --- a/runtime/compiler/optimizer/ProfileGenerator.cpp +++ b/runtime/compiler/optimizer/ProfileGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/ProfileGenerator.hpp" diff --git a/runtime/compiler/optimizer/ProfileGenerator.hpp b/runtime/compiler/optimizer/ProfileGenerator.hpp index 828828c5931..b45ae3eb838 100644 --- a/runtime/compiler/optimizer/ProfileGenerator.hpp +++ b/runtime/compiler/optimizer/ProfileGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PROFILEGENERATOR_INCL diff --git a/runtime/compiler/optimizer/RecognizedCallTransformer.hpp b/runtime/compiler/optimizer/RecognizedCallTransformer.hpp index 41933bea38c..acca5156528 100644 --- a/runtime/compiler/optimizer/RecognizedCallTransformer.hpp +++ b/runtime/compiler/optimizer/RecognizedCallTransformer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_RECOGNIZEDCALLTRANSFORMER_INCL diff --git a/runtime/compiler/optimizer/SPMDParallelizer.cpp b/runtime/compiler/optimizer/SPMDParallelizer.cpp index 7367bda1775..d05f8d9c4a7 100644 --- a/runtime/compiler/optimizer/SPMDParallelizer.cpp +++ b/runtime/compiler/optimizer/SPMDParallelizer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/SPMDParallelizer.hpp" diff --git a/runtime/compiler/optimizer/SPMDParallelizer.hpp b/runtime/compiler/optimizer/SPMDParallelizer.hpp index d6c91db989e..bf3a9ecb337 100644 --- a/runtime/compiler/optimizer/SPMDParallelizer.hpp +++ b/runtime/compiler/optimizer/SPMDParallelizer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SPMDPARALLELIZER_INCL diff --git a/runtime/compiler/optimizer/SPMDPreCheck.cpp b/runtime/compiler/optimizer/SPMDPreCheck.cpp index 35fe554160f..e020fcebfd7 100644 --- a/runtime/compiler/optimizer/SPMDPreCheck.cpp +++ b/runtime/compiler/optimizer/SPMDPreCheck.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/SPMDPreCheck.hpp" diff --git a/runtime/compiler/optimizer/SPMDPreCheck.hpp b/runtime/compiler/optimizer/SPMDPreCheck.hpp index ebc338a41f3..f3259bb7ec9 100644 --- a/runtime/compiler/optimizer/SPMDPreCheck.hpp +++ b/runtime/compiler/optimizer/SPMDPreCheck.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp b/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp index 34d156239a8..7a4470f02df 100644 --- a/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp +++ b/runtime/compiler/optimizer/SequentialStoreSimplifier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/SequentialStoreSimplifier.hpp" diff --git a/runtime/compiler/optimizer/SequentialStoreSimplifier.hpp b/runtime/compiler/optimizer/SequentialStoreSimplifier.hpp index 04b9eb109fd..2586259b357 100644 --- a/runtime/compiler/optimizer/SequentialStoreSimplifier.hpp +++ b/runtime/compiler/optimizer/SequentialStoreSimplifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SEQUENTIAL_STORE_SIMPLIFIER_INCL diff --git a/runtime/compiler/optimizer/SignExtendLoads.cpp b/runtime/compiler/optimizer/SignExtendLoads.cpp index d8b61331912..d1190a34707 100644 --- a/runtime/compiler/optimizer/SignExtendLoads.cpp +++ b/runtime/compiler/optimizer/SignExtendLoads.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/SignExtendLoads.hpp" diff --git a/runtime/compiler/optimizer/SignExtendLoads.hpp b/runtime/compiler/optimizer/SignExtendLoads.hpp index ccb9cf5d9f4..515b01230b1 100644 --- a/runtime/compiler/optimizer/SignExtendLoads.hpp +++ b/runtime/compiler/optimizer/SignExtendLoads.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIGN_EXTEND_LOADS_INCL diff --git a/runtime/compiler/optimizer/Simplifier.hpp b/runtime/compiler/optimizer/Simplifier.hpp index 461cd18523b..0e2f06de84f 100644 --- a/runtime/compiler/optimizer/Simplifier.hpp +++ b/runtime/compiler/optimizer/Simplifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_SIMPLIFIER_INCL diff --git a/runtime/compiler/optimizer/SimplifierHandlers.hpp b/runtime/compiler/optimizer/SimplifierHandlers.hpp index 134737f78a8..333b6a0d050 100644 --- a/runtime/compiler/optimizer/SimplifierHandlers.hpp +++ b/runtime/compiler/optimizer/SimplifierHandlers.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIMPLIFIERHANDLERS_INCL diff --git a/runtime/compiler/optimizer/SimplifierTable.enum b/runtime/compiler/optimizer/SimplifierTable.enum index b3a0eb73935..5f3b333fac7 100644 --- a/runtime/compiler/optimizer/SimplifierTable.enum +++ b/runtime/compiler/optimizer/SimplifierTable.enum @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIMPLIFIERTABLE_ENUM_INCL diff --git a/runtime/compiler/optimizer/StaticFinalFieldFolding.cpp b/runtime/compiler/optimizer/StaticFinalFieldFolding.cpp index ffaa324d998..1da78c4f2c1 100644 --- a/runtime/compiler/optimizer/StaticFinalFieldFolding.cpp +++ b/runtime/compiler/optimizer/StaticFinalFieldFolding.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/StaticFinalFieldFolding.hpp" diff --git a/runtime/compiler/optimizer/StaticFinalFieldFolding.hpp b/runtime/compiler/optimizer/StaticFinalFieldFolding.hpp index afdb370ad80..3658c4783d3 100644 --- a/runtime/compiler/optimizer/StaticFinalFieldFolding.hpp +++ b/runtime/compiler/optimizer/StaticFinalFieldFolding.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STATICFINALFIELDFOLDING_INCL diff --git a/runtime/compiler/optimizer/StringBuilderTransformer.cpp b/runtime/compiler/optimizer/StringBuilderTransformer.cpp index acd7d68c4b8..0362004ce2f 100644 --- a/runtime/compiler/optimizer/StringBuilderTransformer.cpp +++ b/runtime/compiler/optimizer/StringBuilderTransformer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/StringBuilderTransformer.hpp" diff --git a/runtime/compiler/optimizer/StringBuilderTransformer.hpp b/runtime/compiler/optimizer/StringBuilderTransformer.hpp index f82b5b68c8f..48973f9224a 100644 --- a/runtime/compiler/optimizer/StringBuilderTransformer.hpp +++ b/runtime/compiler/optimizer/StringBuilderTransformer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STRINGBUILDERTRANSFORMER_INCL diff --git a/runtime/compiler/optimizer/StringPeepholes.cpp b/runtime/compiler/optimizer/StringPeepholes.cpp index 8f510ddcc7f..7abc3662dc2 100644 --- a/runtime/compiler/optimizer/StringPeepholes.cpp +++ b/runtime/compiler/optimizer/StringPeepholes.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/StringPeepholes.hpp" diff --git a/runtime/compiler/optimizer/StringPeepholes.hpp b/runtime/compiler/optimizer/StringPeepholes.hpp index f98013e4dd2..c5500c571e0 100644 --- a/runtime/compiler/optimizer/StringPeepholes.hpp +++ b/runtime/compiler/optimizer/StringPeepholes.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STRINGPEEPHOLES_INCL diff --git a/runtime/compiler/optimizer/TransformUtil.hpp b/runtime/compiler/optimizer/TransformUtil.hpp index b93bedb1876..af4429b4635 100644 --- a/runtime/compiler/optimizer/TransformUtil.hpp +++ b/runtime/compiler/optimizer/TransformUtil.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_TRANSFORMUTIL_INCL #define TR_TRANSFORMUTIL_INCL diff --git a/runtime/compiler/optimizer/TreeLowering.cpp b/runtime/compiler/optimizer/TreeLowering.cpp index c7995b58010..b84c37de8f7 100644 --- a/runtime/compiler/optimizer/TreeLowering.cpp +++ b/runtime/compiler/optimizer/TreeLowering.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/TreeLowering.hpp" diff --git a/runtime/compiler/optimizer/TreeLowering.hpp b/runtime/compiler/optimizer/TreeLowering.hpp index fd09175c40f..7074893ab99 100644 --- a/runtime/compiler/optimizer/TreeLowering.hpp +++ b/runtime/compiler/optimizer/TreeLowering.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TREELOWERING_INCL diff --git a/runtime/compiler/optimizer/UnsafeFastPath.cpp b/runtime/compiler/optimizer/UnsafeFastPath.cpp index 4bfb952e126..0527d11b364 100644 --- a/runtime/compiler/optimizer/UnsafeFastPath.cpp +++ b/runtime/compiler/optimizer/UnsafeFastPath.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/UnsafeFastPath.hpp" diff --git a/runtime/compiler/optimizer/UnsafeFastPath.hpp b/runtime/compiler/optimizer/UnsafeFastPath.hpp index 88a482f6ffa..be51749c7cd 100644 --- a/runtime/compiler/optimizer/UnsafeFastPath.hpp +++ b/runtime/compiler/optimizer/UnsafeFastPath.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNSAFEFASTPATH_INCL diff --git a/runtime/compiler/optimizer/VPBCDConstraint.cpp b/runtime/compiler/optimizer/VPBCDConstraint.cpp index 50d8852eacd..21316a3019b 100644 --- a/runtime/compiler/optimizer/VPBCDConstraint.cpp +++ b/runtime/compiler/optimizer/VPBCDConstraint.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/VPBCDConstraint.hpp" diff --git a/runtime/compiler/optimizer/VPBCDConstraint.hpp b/runtime/compiler/optimizer/VPBCDConstraint.hpp index 936b1f61c1b..552be87eeb0 100644 --- a/runtime/compiler/optimizer/VPBCDConstraint.hpp +++ b/runtime/compiler/optimizer/VPBCDConstraint.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BCDVPCONSTRAINT_INCL diff --git a/runtime/compiler/optimizer/ValuePropagation.hpp b/runtime/compiler/optimizer/ValuePropagation.hpp index e854a5c9c30..3d705ed4db7 100644 --- a/runtime/compiler/optimizer/ValuePropagation.hpp +++ b/runtime/compiler/optimizer/ValuePropagation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_VALUEPROPAGATION_INCL diff --git a/runtime/compiler/optimizer/VarHandleTransformer.cpp b/runtime/compiler/optimizer/VarHandleTransformer.cpp index 974a947f88f..c8e01f33fb5 100644 --- a/runtime/compiler/optimizer/VarHandleTransformer.cpp +++ b/runtime/compiler/optimizer/VarHandleTransformer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "optimizer/VarHandleTransformer.hpp" diff --git a/runtime/compiler/optimizer/VarHandleTransformer.hpp b/runtime/compiler/optimizer/VarHandleTransformer.hpp index 64cbe51bbfb..3a21481aa3a 100644 --- a/runtime/compiler/optimizer/VarHandleTransformer.hpp +++ b/runtime/compiler/optimizer/VarHandleTransformer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VARHANDLETRANSFORMER_INCL diff --git a/runtime/compiler/optimizer/VectorAPIExpansion.cpp b/runtime/compiler/optimizer/VectorAPIExpansion.cpp index d10ed4f96ae..b1727359682 100644 --- a/runtime/compiler/optimizer/VectorAPIExpansion.cpp +++ b/runtime/compiler/optimizer/VectorAPIExpansion.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/ResolvedMethod.hpp" #include "env/StackMemoryRegion.hpp" diff --git a/runtime/compiler/optimizer/VectorAPIExpansion.hpp b/runtime/compiler/optimizer/VectorAPIExpansion.hpp index 706427de7af..c49ca1360e1 100644 --- a/runtime/compiler/optimizer/VectorAPIExpansion.hpp +++ b/runtime/compiler/optimizer/VectorAPIExpansion.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VECTORAPIEXPANSION_INCL #define VECTORAPIEXPANSION_INCL diff --git a/runtime/compiler/p/CMakeLists.txt b/runtime/compiler/p/CMakeLists.txt index b2a96336822..ce95a9b2656 100644 --- a/runtime/compiler/p/CMakeLists.txt +++ b/runtime/compiler/p/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Manage cross compilation here: diff --git a/runtime/compiler/p/codegen/CMakeLists.txt b/runtime/compiler/p/codegen/CMakeLists.txt index 51c3652ae3d..1795af11ee8 100644 --- a/runtime/compiler/p/codegen/CMakeLists.txt +++ b/runtime/compiler/p/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/p/codegen/CallSnippet.cpp b/runtime/compiler/p/codegen/CallSnippet.cpp index 1fa59567123..74aaafa5632 100644 --- a/runtime/compiler/p/codegen/CallSnippet.cpp +++ b/runtime/compiler/p/codegen/CallSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/CallSnippet.hpp" diff --git a/runtime/compiler/p/codegen/CallSnippet.hpp b/runtime/compiler/p/codegen/CallSnippet.hpp index 7b870abbb03..f5af38d8854 100644 --- a/runtime/compiler/p/codegen/CallSnippet.hpp +++ b/runtime/compiler/p/codegen/CallSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCCALLSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/ConstantDataSnippet.hpp b/runtime/compiler/p/codegen/ConstantDataSnippet.hpp index 84cd8018e3e..bf737efed5e 100644 --- a/runtime/compiler/p/codegen/ConstantDataSnippet.hpp +++ b/runtime/compiler/p/codegen/ConstantDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CONSTANTDATASNIPPET_INCL diff --git a/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp b/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp index 0c3e5d498d0..30e0fecb965 100644 --- a/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp +++ b/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/ForceRecompilationSnippet.hpp" diff --git a/runtime/compiler/p/codegen/ForceRecompilationSnippet.hpp b/runtime/compiler/p/codegen/ForceRecompilationSnippet.hpp index 71709f50f1a..edb9ba45d7c 100644 --- a/runtime/compiler/p/codegen/ForceRecompilationSnippet.hpp +++ b/runtime/compiler/p/codegen/ForceRecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPC_FORCERECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/GenerateInstructions.cpp b/runtime/compiler/p/codegen/GenerateInstructions.cpp index 485db1475b3..45c48e647c5 100644 --- a/runtime/compiler/p/codegen/GenerateInstructions.cpp +++ b/runtime/compiler/p/codegen/GenerateInstructions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/GenerateInstructions.hpp" diff --git a/runtime/compiler/p/codegen/GenerateInstructions.hpp b/runtime/compiler/p/codegen/GenerateInstructions.hpp index dc73e20046e..f5711c00dbc 100644 --- a/runtime/compiler/p/codegen/GenerateInstructions.hpp +++ b/runtime/compiler/p/codegen/GenerateInstructions.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/GenerateOMRInstructions.hpp" diff --git a/runtime/compiler/p/codegen/Instruction.hpp b/runtime/compiler/p/codegen/Instruction.hpp index c991ac42204..e3a1b344de8 100644 --- a/runtime/compiler/p/codegen/Instruction.hpp +++ b/runtime/compiler/p/codegen/Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRJ9_INSTRUCTION_INCL diff --git a/runtime/compiler/p/codegen/InterfaceCastSnippet.cpp b/runtime/compiler/p/codegen/InterfaceCastSnippet.cpp index 32da658e432..7fb38487192 100644 --- a/runtime/compiler/p/codegen/InterfaceCastSnippet.cpp +++ b/runtime/compiler/p/codegen/InterfaceCastSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/InterfaceCastSnippet.hpp" diff --git a/runtime/compiler/p/codegen/InterfaceCastSnippet.hpp b/runtime/compiler/p/codegen/InterfaceCastSnippet.hpp index 701ccd60c5d..363a5db549d 100644 --- a/runtime/compiler/p/codegen/InterfaceCastSnippet.hpp +++ b/runtime/compiler/p/codegen/InterfaceCastSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCINTERFACECASTSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/J9AheadOfTimeCompile.cpp b/runtime/compiler/p/codegen/J9AheadOfTimeCompile.cpp index 4b143c278db..05e6ad6a2f6 100644 --- a/runtime/compiler/p/codegen/J9AheadOfTimeCompile.cpp +++ b/runtime/compiler/p/codegen/J9AheadOfTimeCompile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/p/codegen/J9AheadOfTimeCompile.hpp b/runtime/compiler/p/codegen/J9AheadOfTimeCompile.hpp index de6dd42de97..581b8fb03e8 100644 --- a/runtime/compiler/p/codegen/J9AheadOfTimeCompile.hpp +++ b/runtime/compiler/p/codegen/J9AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PPC_AHEADOFTIMECOMPILE_INCL diff --git a/runtime/compiler/p/codegen/J9CodeGenerator.cpp b/runtime/compiler/p/codegen/J9CodeGenerator.cpp index 23d532a7e47..4887a261122 100644 --- a/runtime/compiler/p/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/p/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/p/codegen/J9CodeGenerator.hpp b/runtime/compiler/p/codegen/J9CodeGenerator.hpp index 169b30df57c..ed658d79950 100644 --- a/runtime/compiler/p/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/p/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_POWER_CODEGENERATOR_INCL diff --git a/runtime/compiler/p/codegen/J9ConstantDataSnippet.hpp b/runtime/compiler/p/codegen/J9ConstantDataSnippet.hpp index f31b4b5771a..40f4d4c0d0c 100644 --- a/runtime/compiler/p/codegen/J9ConstantDataSnippet.hpp +++ b/runtime/compiler/p/codegen/J9ConstantDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PPCCONSTANTDATASNIPPET_INCL diff --git a/runtime/compiler/p/codegen/J9InstructionDelegate.hpp b/runtime/compiler/p/codegen/J9InstructionDelegate.hpp index c4921412545..bcfb2e96bd5 100644 --- a/runtime/compiler/p/codegen/J9InstructionDelegate.hpp +++ b/runtime/compiler/p/codegen/J9InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_POWER_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/p/codegen/J9PPCInstruction.cpp b/runtime/compiler/p/codegen/J9PPCInstruction.cpp index 63ed5665739..45667dc9af9 100644 --- a/runtime/compiler/p/codegen/J9PPCInstruction.cpp +++ b/runtime/compiler/p/codegen/J9PPCInstruction.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCInstruction.hpp" diff --git a/runtime/compiler/p/codegen/J9PPCSnippet.cpp b/runtime/compiler/p/codegen/J9PPCSnippet.cpp index 68bc4bedc40..5d995365c60 100644 --- a/runtime/compiler/p/codegen/J9PPCSnippet.cpp +++ b/runtime/compiler/p/codegen/J9PPCSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/J9PPCSnippet.hpp" diff --git a/runtime/compiler/p/codegen/J9PPCSnippet.hpp b/runtime/compiler/p/codegen/J9PPCSnippet.hpp index 58bab34a80b..7c4ad295f08 100644 --- a/runtime/compiler/p/codegen/J9PPCSnippet.hpp +++ b/runtime/compiler/p/codegen/J9PPCSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9PPCSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/J9PPCWatchedInstanceFieldSnippet.hpp b/runtime/compiler/p/codegen/J9PPCWatchedInstanceFieldSnippet.hpp index b0daf066e39..a9ae730649c 100644 --- a/runtime/compiler/p/codegen/J9PPCWatchedInstanceFieldSnippet.hpp +++ b/runtime/compiler/p/codegen/J9PPCWatchedInstanceFieldSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9PPCWATCHEDINSTANCEFIELDSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/J9PPCWatchedStaticFieldSnippet.hpp b/runtime/compiler/p/codegen/J9PPCWatchedStaticFieldSnippet.hpp index 70a92de06fe..3d14781314d 100644 --- a/runtime/compiler/p/codegen/J9PPCWatchedStaticFieldSnippet.hpp +++ b/runtime/compiler/p/codegen/J9PPCWatchedStaticFieldSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9PPCWATCHEDSTATICFIELDSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/J9TreeEvaluator.cpp b/runtime/compiler/p/codegen/J9TreeEvaluator.cpp index 21aacd2babe..7eaf93cf43f 100644 --- a/runtime/compiler/p/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/p/codegen/J9TreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/p/codegen/J9TreeEvaluator.hpp b/runtime/compiler/p/codegen/J9TreeEvaluator.hpp index a6bb7a86db6..8f22d6769a0 100644 --- a/runtime/compiler/p/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/p/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PPC_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp b/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp index d9e7318e476..dfed1f955df 100644 --- a/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp +++ b/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/UnresolvedDataSnippet.hpp" diff --git a/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.hpp b/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.hpp index 9c35e6e1ec8..ffa7f56cd0f 100644 --- a/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.hpp +++ b/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PPCUNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/p/codegen/PPCJNILinkage.cpp b/runtime/compiler/p/codegen/PPCJNILinkage.cpp index e644ed12ada..143984967f8 100644 --- a/runtime/compiler/p/codegen/PPCJNILinkage.cpp +++ b/runtime/compiler/p/codegen/PPCJNILinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/PPCJNILinkage.hpp" diff --git a/runtime/compiler/p/codegen/PPCJNILinkage.hpp b/runtime/compiler/p/codegen/PPCJNILinkage.hpp index fb63fdb1414..dd90a8863e1 100644 --- a/runtime/compiler/p/codegen/PPCJNILinkage.hpp +++ b/runtime/compiler/p/codegen/PPCJNILinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPC_JNILINKAGE_INCL diff --git a/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp b/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp index e6b35a5c91d..03e726b114d 100644 --- a/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp +++ b/runtime/compiler/p/codegen/PPCPrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/PPCPrivateLinkage.hpp" diff --git a/runtime/compiler/p/codegen/PPCPrivateLinkage.hpp b/runtime/compiler/p/codegen/PPCPrivateLinkage.hpp index 575ae4ed413..d77419fa83b 100644 --- a/runtime/compiler/p/codegen/PPCPrivateLinkage.hpp +++ b/runtime/compiler/p/codegen/PPCPrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPC_PRIVATELINKAGE_INCL diff --git a/runtime/compiler/p/codegen/PPCRecompilation.cpp b/runtime/compiler/p/codegen/PPCRecompilation.cpp index cb494cec414..d7c290ebfe5 100644 --- a/runtime/compiler/p/codegen/PPCRecompilation.cpp +++ b/runtime/compiler/p/codegen/PPCRecompilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCRecompilation.hpp" diff --git a/runtime/compiler/p/codegen/PPCRecompilation.hpp b/runtime/compiler/p/codegen/PPCRecompilation.hpp index 53979b62af9..7cfd4ed502a 100644 --- a/runtime/compiler/p/codegen/PPCRecompilation.hpp +++ b/runtime/compiler/p/codegen/PPCRecompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCRECOMPILATION_INCL diff --git a/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp b/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp index 88fd2dd6e6c..7795509403b 100644 --- a/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp +++ b/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/PPCRecompilationSnippet.hpp" diff --git a/runtime/compiler/p/codegen/PPCRecompilationSnippet.hpp b/runtime/compiler/p/codegen/PPCRecompilationSnippet.hpp index d64b1030030..74286d3442f 100644 --- a/runtime/compiler/p/codegen/PPCRecompilationSnippet.hpp +++ b/runtime/compiler/p/codegen/PPCRecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCRECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp b/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp index ae860be0ef6..753c4b6919f 100644 --- a/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp +++ b/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/codegen/StackCheckFailureSnippet.hpp" diff --git a/runtime/compiler/p/codegen/StackCheckFailureSnippet.hpp b/runtime/compiler/p/codegen/StackCheckFailureSnippet.hpp index af6ad0ec09d..d03d9d144b9 100644 --- a/runtime/compiler/p/codegen/StackCheckFailureSnippet.hpp +++ b/runtime/compiler/p/codegen/StackCheckFailureSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCSTACKCHECKFAILURESNIPPET_INCL diff --git a/runtime/compiler/p/codegen/Trampoline.cpp b/runtime/compiler/p/codegen/Trampoline.cpp index 6e0dcbf507e..3007beab033 100644 --- a/runtime/compiler/p/codegen/Trampoline.cpp +++ b/runtime/compiler/p/codegen/Trampoline.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/p/env/CMakeLists.txt b/runtime/compiler/p/env/CMakeLists.txt index 6cddde486f6..a05deddce55 100644 --- a/runtime/compiler/p/env/CMakeLists.txt +++ b/runtime/compiler/p/env/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/p/env/J9CPU.cpp b/runtime/compiler/p/env/J9CPU.cpp index b5b599fc4dc..819e47b560a 100644 --- a/runtime/compiler/p/env/J9CPU.cpp +++ b/runtime/compiler/p/env/J9CPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/p/env/J9CPU.hpp b/runtime/compiler/p/env/J9CPU.hpp index d54f2ad9a5f..16fb3288dc1 100644 --- a/runtime/compiler/p/env/J9CPU.hpp +++ b/runtime/compiler/p/env/J9CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_POWER_CPU_INCL diff --git a/runtime/compiler/p/runtime/CMakeLists.txt b/runtime/compiler/p/runtime/CMakeLists.txt index c9e60710131..bf05865d079 100644 --- a/runtime/compiler/p/runtime/CMakeLists.txt +++ b/runtime/compiler/p/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(OMR_OS_AIX) diff --git a/runtime/compiler/p/runtime/CodeSync.cpp b/runtime/compiler/p/runtime/CodeSync.cpp index 759f4c3959b..972d5532529 100644 --- a/runtime/compiler/p/runtime/CodeSync.cpp +++ b/runtime/compiler/p/runtime/CodeSync.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/runtime/PPCCodeSync.inc" diff --git a/runtime/compiler/p/runtime/Emulation.c b/runtime/compiler/p/runtime/Emulation.c index 854eb202ba1..e4cbd0d08e3 100644 --- a/runtime/compiler/p/runtime/Emulation.c +++ b/runtime/compiler/p/runtime/Emulation.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/p/runtime/J9PPCArrayCopy.spp b/runtime/compiler/p/runtime/J9PPCArrayCopy.spp index 733c8f6bd10..f11e8c5e750 100644 --- a/runtime/compiler/p/runtime/J9PPCArrayCopy.spp +++ b/runtime/compiler/p/runtime/J9PPCArrayCopy.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ! generalArrayCopy and referenceArrayCopy have: ! srcObj -- r5 diff --git a/runtime/compiler/p/runtime/J9PPCArrayTranslate.spp b/runtime/compiler/p/runtime/J9PPCArrayTranslate.spp index b97e09123bb..66c6fc01c07 100644 --- a/runtime/compiler/p/runtime/J9PPCArrayTranslate.spp +++ b/runtime/compiler/p/runtime/J9PPCArrayTranslate.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #include "j9cfg.h" #include "jilconsts.inc" diff --git a/runtime/compiler/p/runtime/J9PPCCRC32.spp b/runtime/compiler/p/runtime/J9PPCCRC32.spp index 0b408bc3587..d099f2b75eb 100644 --- a/runtime/compiler/p/runtime/J9PPCCRC32.spp +++ b/runtime/compiler/p/runtime/J9PPCCRC32.spp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/p/runtime/J9PPCCRC32C_constants.h b/runtime/compiler/p/runtime/J9PPCCRC32C_constants.h index 933768db1c7..e05a87dc987 100644 --- a/runtime/compiler/p/runtime/J9PPCCRC32C_constants.h +++ b/runtime/compiler/p/runtime/J9PPCCRC32C_constants.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define CRC32C 0x1edc6f41 diff --git a/runtime/compiler/p/runtime/J9PPCCRC32_constants.h b/runtime/compiler/p/runtime/J9PPCCRC32_constants.h index 9c3534602a7..53dbb8526e7 100644 --- a/runtime/compiler/p/runtime/J9PPCCRC32_constants.h +++ b/runtime/compiler/p/runtime/J9PPCCRC32_constants.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define CRC 0x4c11db7 diff --git a/runtime/compiler/p/runtime/J9PPCCRC32_wrapper.c b/runtime/compiler/p/runtime/J9PPCCRC32_wrapper.c index cae05b1aa6e..b6e5dbecc64 100644 --- a/runtime/compiler/p/runtime/J9PPCCRC32_wrapper.c +++ b/runtime/compiler/p/runtime/J9PPCCRC32_wrapper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define CRC_TABLE diff --git a/runtime/compiler/p/runtime/J9PPCCompressString.spp b/runtime/compiler/p/runtime/J9PPCCompressString.spp index e04cd83010e..3f3ffc076ac 100644 --- a/runtime/compiler/p/runtime/J9PPCCompressString.spp +++ b/runtime/compiler/p/runtime/J9PPCCompressString.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ! generalArrayCopy and referenceArrayCopy have: ! srcObj -- r5 diff --git a/runtime/compiler/p/runtime/J9PPCEncodeUTF16.spp b/runtime/compiler/p/runtime/J9PPCEncodeUTF16.spp index 27f66c73dc2..0807d2ead51 100644 --- a/runtime/compiler/p/runtime/J9PPCEncodeUTF16.spp +++ b/runtime/compiler/p/runtime/J9PPCEncodeUTF16.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #include "j9cfg.h" #include "jilconsts.inc" diff --git a/runtime/compiler/p/runtime/Math.spp b/runtime/compiler/p/runtime/Math.spp index fbb1821e5aa..64a0d176822 100644 --- a/runtime/compiler/p/runtime/Math.spp +++ b/runtime/compiler/p/runtime/Math.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ! __longDivide (does remainder as well)(only used in 32-bit mode) ! inputs r3,r4,r5,r6 diff --git a/runtime/compiler/p/runtime/PPCCompressString.inc b/runtime/compiler/p/runtime/PPCCompressString.inc index 787040d4c0f..c14eeeaaac3 100644 --- a/runtime/compiler/p/runtime/PPCCompressString.inc +++ b/runtime/compiler/p/runtime/PPCCompressString.inc @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ! arrayCopy*, wordArrayCopy*, halfWordArrayCopy*, forwardArrayCopy*, ! forwardWordArrayCopy*, forwardHalfWordArrayCopy*: diff --git a/runtime/compiler/p/runtime/PPCHWProfiler.cpp b/runtime/compiler/p/runtime/PPCHWProfiler.cpp index 6a9fe8c4eb1..da5db2a61f9 100644 --- a/runtime/compiler/p/runtime/PPCHWProfiler.cpp +++ b/runtime/compiler/p/runtime/PPCHWProfiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/runtime/PPCHWProfiler.hpp" diff --git a/runtime/compiler/p/runtime/PPCHWProfiler.hpp b/runtime/compiler/p/runtime/PPCHWProfiler.hpp index 8b9f54f881f..2bb441ccde3 100644 --- a/runtime/compiler/p/runtime/PPCHWProfiler.hpp +++ b/runtime/compiler/p/runtime/PPCHWProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCHWPROFILER_INCL diff --git a/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp b/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp index a5ab7a01269..e36d47bce86 100644 --- a/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp +++ b/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/p/runtime/PPCHWProfilerLinux.cpp b/runtime/compiler/p/runtime/PPCHWProfilerLinux.cpp index afc60ccec06..6cd434fecf3 100644 --- a/runtime/compiler/p/runtime/PPCHWProfilerLinux.cpp +++ b/runtime/compiler/p/runtime/PPCHWProfilerLinux.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/compiler/p/runtime/PPCHWProfilerPrivate.hpp b/runtime/compiler/p/runtime/PPCHWProfilerPrivate.hpp index cc3302b4cb3..baff5feecc1 100644 --- a/runtime/compiler/p/runtime/PPCHWProfilerPrivate.hpp +++ b/runtime/compiler/p/runtime/PPCHWProfilerPrivate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCHWPROFILERPRIVATE_INCL diff --git a/runtime/compiler/p/runtime/PPCRelocationTarget.cpp b/runtime/compiler/p/runtime/PPCRelocationTarget.cpp index 55faaf8d5f4..731b4ef8ff5 100644 --- a/runtime/compiler/p/runtime/PPCRelocationTarget.cpp +++ b/runtime/compiler/p/runtime/PPCRelocationTarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "p/runtime/PPCRelocationTarget.hpp" diff --git a/runtime/compiler/p/runtime/PPCRelocationTarget.hpp b/runtime/compiler/p/runtime/PPCRelocationTarget.hpp index db76a89d627..4958a240315 100644 --- a/runtime/compiler/p/runtime/PPCRelocationTarget.hpp +++ b/runtime/compiler/p/runtime/PPCRelocationTarget.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PPCRELOCATION_TARGET_INCL diff --git a/runtime/compiler/p/runtime/PicBuilder.spp b/runtime/compiler/p/runtime/PicBuilder.spp index 17231228900..f2e3bdca57a 100644 --- a/runtime/compiler/p/runtime/PicBuilder.spp +++ b/runtime/compiler/p/runtime/PicBuilder.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #include "j9cfg.h" #include "jilconsts.inc" diff --git a/runtime/compiler/p/runtime/Recomp.cpp b/runtime/compiler/p/runtime/Recomp.cpp index e063069addd..0b0888b641a 100644 --- a/runtime/compiler/p/runtime/Recomp.cpp +++ b/runtime/compiler/p/runtime/Recomp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "control/Recompilation.hpp" diff --git a/runtime/compiler/p/runtime/Recompilation.spp b/runtime/compiler/p/runtime/Recompilation.spp index e0c745e525c..1dc586a526b 100644 --- a/runtime/compiler/p/runtime/Recompilation.spp +++ b/runtime/compiler/p/runtime/Recompilation.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #include "j9cfg.h" #include "jilconsts.inc" diff --git a/runtime/compiler/p/runtime/RestoreGPRs.inc b/runtime/compiler/p/runtime/RestoreGPRs.inc index 87507961236..7c134678057 100644 --- a/runtime/compiler/p/runtime/RestoreGPRs.inc +++ b/runtime/compiler/p/runtime/RestoreGPRs.inc @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #ifdef TR_HOST_64BIT ld r0, 0(J9SP) diff --git a/runtime/compiler/p/runtime/SaveGPRs.inc b/runtime/compiler/p/runtime/SaveGPRs.inc index b60dfd75865..8d29d39ecf0 100644 --- a/runtime/compiler/p/runtime/SaveGPRs.inc +++ b/runtime/compiler/p/runtime/SaveGPRs.inc @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #ifdef TR_HOST_64BIT std r0,-264(J9SP) ! Save all registers diff --git a/runtime/compiler/p/runtime/ebb.spp b/runtime/compiler/p/runtime/ebb.spp index 1f13c48685a..efcfeaea575 100644 --- a/runtime/compiler/p/runtime/ebb.spp +++ b/runtime/compiler/p/runtime/ebb.spp @@ -16,7 +16,7 @@ !! [1] https://www.gnu.org/software/classpath/license.html !! [2] https://openjdk.org/legal/assembly-exception.html !! -!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +!! SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 #include "j9cfg.h" #include "jilconsts.inc" diff --git a/runtime/compiler/p/runtime/ppccdefines.inc b/runtime/compiler/p/runtime/ppccdefines.inc index 6b8c3df40fd..d8333eebb2c 100644 --- a/runtime/compiler/p/runtime/ppccdefines.inc +++ b/runtime/compiler/p/runtime/ppccdefines.inc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /************************************************************************** diff --git a/runtime/compiler/ras/CMakeLists.txt b/runtime/compiler/ras/CMakeLists.txt index 4f883140997..4bf60d5dace 100644 --- a/runtime/compiler/ras/CMakeLists.txt +++ b/runtime/compiler/ras/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/ras/HashTable.cpp b/runtime/compiler/ras/HashTable.cpp index 73d74db4677..a8263dc3509 100644 --- a/runtime/compiler/ras/HashTable.cpp +++ b/runtime/compiler/ras/HashTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/HashTable.hpp" diff --git a/runtime/compiler/ras/HashTable.hpp b/runtime/compiler/ras/HashTable.hpp index 9642ac5f797..b59cb1f5282 100644 --- a/runtime/compiler/ras/HashTable.hpp +++ b/runtime/compiler/ras/HashTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HASHTABLE_INCL diff --git a/runtime/compiler/ras/InternalFunctions.cpp b/runtime/compiler/ras/InternalFunctions.cpp index ca309cd681f..d7f4156fd99 100644 --- a/runtime/compiler/ras/InternalFunctions.cpp +++ b/runtime/compiler/ras/InternalFunctions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/InternalFunctions.hpp" diff --git a/runtime/compiler/ras/InternalFunctions.hpp b/runtime/compiler/ras/InternalFunctions.hpp index 84c12bafae1..62e0c7d4c89 100644 --- a/runtime/compiler/ras/InternalFunctions.hpp +++ b/runtime/compiler/ras/InternalFunctions.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // __ ___ __ __ ___ __ ___ ___ __ diff --git a/runtime/compiler/ras/JavaILValidator.cpp b/runtime/compiler/ras/JavaILValidator.cpp index f6a9a6e5d9d..af76a055823 100644 --- a/runtime/compiler/ras/JavaILValidator.cpp +++ b/runtime/compiler/ras/JavaILValidator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ras/JavaILValidator.hpp" diff --git a/runtime/compiler/ras/JavaILValidator.hpp b/runtime/compiler/ras/JavaILValidator.hpp index 8a590750994..9818f48b468 100644 --- a/runtime/compiler/ras/JavaILValidator.hpp +++ b/runtime/compiler/ras/JavaILValidator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JAVAILVALIDATOR_HPP diff --git a/runtime/compiler/ras/kca_offsets_generator.cpp b/runtime/compiler/ras/kca_offsets_generator.cpp index e28b6e5016a..088a7bc70d3 100644 --- a/runtime/compiler/ras/kca_offsets_generator.cpp +++ b/runtime/compiler/ras/kca_offsets_generator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/runtime/ArtifactManager.cpp b/runtime/compiler/runtime/ArtifactManager.cpp index e72a204da57..95b8afaaef6 100644 --- a/runtime/compiler/runtime/ArtifactManager.cpp +++ b/runtime/compiler/runtime/ArtifactManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jithash.h" diff --git a/runtime/compiler/runtime/ArtifactManager.hpp b/runtime/compiler/runtime/ArtifactManager.hpp index ce843c383a3..9857cfe2f64 100644 --- a/runtime/compiler/runtime/ArtifactManager.hpp +++ b/runtime/compiler/runtime/ArtifactManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ARTIFACT_MANAGER_HPP diff --git a/runtime/compiler/runtime/CMakeLists.txt b/runtime/compiler/runtime/CMakeLists.txt index 790da641648..1f504e4e135 100644 --- a/runtime/compiler/runtime/CMakeLists.txt +++ b/runtime/compiler/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/runtime/CRuntimeImpl.cpp b/runtime/compiler/runtime/CRuntimeImpl.cpp index 34bd45578db..6c52740dc56 100644 --- a/runtime/compiler/runtime/CRuntimeImpl.cpp +++ b/runtime/compiler/runtime/CRuntimeImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9WINCE) diff --git a/runtime/compiler/runtime/ClassUnloadAssumption.cpp b/runtime/compiler/runtime/ClassUnloadAssumption.cpp index 11a14a5d2a5..b55e393dd11 100644 --- a/runtime/compiler/runtime/ClassUnloadAssumption.cpp +++ b/runtime/compiler/runtime/ClassUnloadAssumption.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/CodeCache.hpp b/runtime/compiler/runtime/CodeCache.hpp index dcc357c1034..a694a2d51ec 100644 --- a/runtime/compiler/runtime/CodeCache.hpp +++ b/runtime/compiler/runtime/CodeCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHE_INCL diff --git a/runtime/compiler/runtime/CodeCacheManager.hpp b/runtime/compiler/runtime/CodeCacheManager.hpp index a69a2514aa9..b750dad4211 100644 --- a/runtime/compiler/runtime/CodeCacheManager.hpp +++ b/runtime/compiler/runtime/CodeCacheManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHEMANAGER_INCL diff --git a/runtime/compiler/runtime/CodeCacheMemorySegment.hpp b/runtime/compiler/runtime/CodeCacheMemorySegment.hpp index 128f533a7a7..60661aa9f57 100644 --- a/runtime/compiler/runtime/CodeCacheMemorySegment.hpp +++ b/runtime/compiler/runtime/CodeCacheMemorySegment.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_CODECACHEMEMORYSEGMENT_INCL diff --git a/runtime/compiler/runtime/CodeCacheReclamation.h b/runtime/compiler/runtime/CodeCacheReclamation.h index eb21f48054c..ee1b6143d67 100644 --- a/runtime/compiler/runtime/CodeCacheReclamation.h +++ b/runtime/compiler/runtime/CodeCacheReclamation.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef __CODECACHERECLAMATION_H diff --git a/runtime/compiler/runtime/CodeRuntime.hpp b/runtime/compiler/runtime/CodeRuntime.hpp index 5717d93ac03..e0aa96b56fd 100644 --- a/runtime/compiler/runtime/CodeRuntime.hpp +++ b/runtime/compiler/runtime/CodeRuntime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CODERUNTIME_HPP diff --git a/runtime/compiler/runtime/CompileService.cpp b/runtime/compiler/runtime/CompileService.cpp index a931c138995..be2cb6383d7 100644 --- a/runtime/compiler/runtime/CompileService.cpp +++ b/runtime/compiler/runtime/CompileService.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/CompileService.hpp" diff --git a/runtime/compiler/runtime/CompileService.hpp b/runtime/compiler/runtime/CompileService.hpp index be57e30ab4d..ed2ca56debc 100644 --- a/runtime/compiler/runtime/CompileService.hpp +++ b/runtime/compiler/runtime/CompileService.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPILE_SERVICE_H diff --git a/runtime/compiler/runtime/DataCache.cpp b/runtime/compiler/runtime/DataCache.cpp index 2cb246f761c..c072ba2d6b4 100644 --- a/runtime/compiler/runtime/DataCache.cpp +++ b/runtime/compiler/runtime/DataCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/DataCache.hpp b/runtime/compiler/runtime/DataCache.hpp index 6fc82c56a51..440a47e6139 100644 --- a/runtime/compiler/runtime/DataCache.hpp +++ b/runtime/compiler/runtime/DataCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DATACACHE_HPP diff --git a/runtime/compiler/runtime/ExternalProfiler.hpp b/runtime/compiler/runtime/ExternalProfiler.hpp index fdcde0a4b4a..99cde47afd1 100644 --- a/runtime/compiler/runtime/ExternalProfiler.hpp +++ b/runtime/compiler/runtime/ExternalProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef EXTERNALPROFILER_HPP diff --git a/runtime/compiler/runtime/GPUHelpers.cpp b/runtime/compiler/runtime/GPUHelpers.cpp index a593ae33eb5..d4dc7ad1b0e 100644 --- a/runtime/compiler/runtime/GPUHelpers.cpp +++ b/runtime/compiler/runtime/GPUHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef ENABLE_GPU diff --git a/runtime/compiler/runtime/HWProfiler.cpp b/runtime/compiler/runtime/HWProfiler.cpp index 620d9326e76..c1308e4e720 100644 --- a/runtime/compiler/runtime/HWProfiler.cpp +++ b/runtime/compiler/runtime/HWProfiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/HWProfiler.hpp" diff --git a/runtime/compiler/runtime/HWProfiler.hpp b/runtime/compiler/runtime/HWProfiler.hpp index e13f24743da..cfa2273ac34 100644 --- a/runtime/compiler/runtime/HWProfiler.hpp +++ b/runtime/compiler/runtime/HWProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HWPROFILER_HPP diff --git a/runtime/compiler/runtime/HookHelpers.cpp b/runtime/compiler/runtime/HookHelpers.cpp index 54031e9be6d..309902900d4 100644 --- a/runtime/compiler/runtime/HookHelpers.cpp +++ b/runtime/compiler/runtime/HookHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/HookHelpers.hpp" diff --git a/runtime/compiler/runtime/HookHelpers.hpp b/runtime/compiler/runtime/HookHelpers.hpp index 00c7c6a6faf..e004bb3a685 100644 --- a/runtime/compiler/runtime/HookHelpers.hpp +++ b/runtime/compiler/runtime/HookHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HOOK_HELPERS_H diff --git a/runtime/compiler/runtime/IProfiler.cpp b/runtime/compiler/runtime/IProfiler.cpp index e73e5d29af8..24dce75bc7c 100644 --- a/runtime/compiler/runtime/IProfiler.cpp +++ b/runtime/compiler/runtime/IProfiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if SOLARIS || AIXPPC || LINUX diff --git a/runtime/compiler/runtime/IProfiler.hpp b/runtime/compiler/runtime/IProfiler.hpp index f8b8b24081a..283d7db1047 100644 --- a/runtime/compiler/runtime/IProfiler.hpp +++ b/runtime/compiler/runtime/IProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IPROFILER_HPP diff --git a/runtime/compiler/runtime/J9CodeCache.cpp b/runtime/compiler/runtime/J9CodeCache.cpp index 6c346f9d44b..a31e47f3816 100644 --- a/runtime/compiler/runtime/J9CodeCache.cpp +++ b/runtime/compiler/runtime/J9CodeCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef J9ZTPF diff --git a/runtime/compiler/runtime/J9CodeCache.hpp b/runtime/compiler/runtime/J9CodeCache.hpp index 480074312c2..b3ca1c1c499 100644 --- a/runtime/compiler/runtime/J9CodeCache.hpp +++ b/runtime/compiler/runtime/J9CodeCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CODECACHE_INCL diff --git a/runtime/compiler/runtime/J9CodeCacheManager.cpp b/runtime/compiler/runtime/J9CodeCacheManager.cpp index 16f96f8730a..4694e30e7df 100644 --- a/runtime/compiler/runtime/J9CodeCacheManager.cpp +++ b/runtime/compiler/runtime/J9CodeCacheManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/J9CodeCacheManager.hpp b/runtime/compiler/runtime/J9CodeCacheManager.hpp index ebf56d586e2..8a784bde9dd 100644 --- a/runtime/compiler/runtime/J9CodeCacheManager.hpp +++ b/runtime/compiler/runtime/J9CodeCacheManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CODECACHEMANAGER_INCL diff --git a/runtime/compiler/runtime/J9CodeCacheMemorySegment.cpp b/runtime/compiler/runtime/J9CodeCacheMemorySegment.cpp index 9219da64979..5b5390a0ccc 100644 --- a/runtime/compiler/runtime/J9CodeCacheMemorySegment.cpp +++ b/runtime/compiler/runtime/J9CodeCacheMemorySegment.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/J9CodeCacheMemorySegment.hpp b/runtime/compiler/runtime/J9CodeCacheMemorySegment.hpp index e674f10c322..2bd106203dd 100644 --- a/runtime/compiler/runtime/J9CodeCacheMemorySegment.hpp +++ b/runtime/compiler/runtime/J9CodeCacheMemorySegment.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_CODECACHEMEMORYSEGMENT_INCL diff --git a/runtime/compiler/runtime/J9JitPersistentMemory.cpp b/runtime/compiler/runtime/J9JitPersistentMemory.cpp index b995ad9069f..5ddd3da92a9 100644 --- a/runtime/compiler/runtime/J9JitPersistentMemory.cpp +++ b/runtime/compiler/runtime/J9JitPersistentMemory.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "env/RawAllocator.hpp" diff --git a/runtime/compiler/runtime/J9Profiler.cpp b/runtime/compiler/runtime/J9Profiler.cpp index 27a666ccffd..8f7653ff670 100644 --- a/runtime/compiler/runtime/J9Profiler.cpp +++ b/runtime/compiler/runtime/J9Profiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/J9Profiler.hpp" diff --git a/runtime/compiler/runtime/J9Profiler.hpp b/runtime/compiler/runtime/J9Profiler.hpp index 831908687fd..77c4c5021b4 100644 --- a/runtime/compiler/runtime/J9Profiler.hpp +++ b/runtime/compiler/runtime/J9Profiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_PROFILER_INCL diff --git a/runtime/compiler/runtime/J9Runtime.hpp b/runtime/compiler/runtime/J9Runtime.hpp index 16a9a9ea424..98224c3dfc7 100644 --- a/runtime/compiler/runtime/J9Runtime.hpp +++ b/runtime/compiler/runtime/J9Runtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9RUNTIME_INCL diff --git a/runtime/compiler/runtime/J9RuntimeAssumptions.hpp b/runtime/compiler/runtime/J9RuntimeAssumptions.hpp index 4e53cdc917f..d7662a3272b 100644 --- a/runtime/compiler/runtime/J9RuntimeAssumptions.hpp +++ b/runtime/compiler/runtime/J9RuntimeAssumptions.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_RUNTIME_ASSUMPTIONS_INCL diff --git a/runtime/compiler/runtime/J9VMAccess.hpp b/runtime/compiler/runtime/J9VMAccess.hpp index 7e27a728c71..2df81889677 100644 --- a/runtime/compiler/runtime/J9VMAccess.hpp +++ b/runtime/compiler/runtime/J9VMAccess.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9VMACCESS_HPP diff --git a/runtime/compiler/runtime/J9ValueProfiler.hpp b/runtime/compiler/runtime/J9ValueProfiler.hpp index a7b4a3ce9eb..f3d187fc3f5 100644 --- a/runtime/compiler/runtime/J9ValueProfiler.hpp +++ b/runtime/compiler/runtime/J9ValueProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VALUEPROFILER_INCL diff --git a/runtime/compiler/runtime/JITClientSession.cpp b/runtime/compiler/runtime/JITClientSession.cpp index 99c3a7a3bcc..f60950c2ae2 100644 --- a/runtime/compiler/runtime/JITClientSession.cpp +++ b/runtime/compiler/runtime/JITClientSession.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/JITClientSession.hpp" diff --git a/runtime/compiler/runtime/JITClientSession.hpp b/runtime/compiler/runtime/JITClientSession.hpp index d57eb1203a6..1b8e1bcc1ea 100644 --- a/runtime/compiler/runtime/JITClientSession.hpp +++ b/runtime/compiler/runtime/JITClientSession.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JIT_CLIENT_SESSION_H diff --git a/runtime/compiler/runtime/JITServerAOTCache.cpp b/runtime/compiler/runtime/JITServerAOTCache.cpp index 115ea080290..808691bef64 100644 --- a/runtime/compiler/runtime/JITServerAOTCache.cpp +++ b/runtime/compiler/runtime/JITServerAOTCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include // for rename() diff --git a/runtime/compiler/runtime/JITServerAOTCache.hpp b/runtime/compiler/runtime/JITServerAOTCache.hpp index cee6ff2d230..03056bab1f4 100644 --- a/runtime/compiler/runtime/JITServerAOTCache.hpp +++ b/runtime/compiler/runtime/JITServerAOTCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_AOTCACHE_H diff --git a/runtime/compiler/runtime/JITServerAOTDeserializer.cpp b/runtime/compiler/runtime/JITServerAOTDeserializer.cpp index 275c08c7c1e..ec895a8705a 100644 --- a/runtime/compiler/runtime/JITServerAOTDeserializer.cpp +++ b/runtime/compiler/runtime/JITServerAOTDeserializer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicSupport.hpp" diff --git a/runtime/compiler/runtime/JITServerAOTDeserializer.hpp b/runtime/compiler/runtime/JITServerAOTDeserializer.hpp index 4d958a1c61d..de26398cbe8 100644 --- a/runtime/compiler/runtime/JITServerAOTDeserializer.hpp +++ b/runtime/compiler/runtime/JITServerAOTDeserializer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_AOT_DESERIALIZER_H diff --git a/runtime/compiler/runtime/JITServerAOTSerializationRecords.hpp b/runtime/compiler/runtime/JITServerAOTSerializationRecords.hpp index cbe3ec8fa39..d84246779fb 100644 --- a/runtime/compiler/runtime/JITServerAOTSerializationRecords.hpp +++ b/runtime/compiler/runtime/JITServerAOTSerializationRecords.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_AOT_SERIALIZATION_RECORDS_H diff --git a/runtime/compiler/runtime/JITServerIProfiler.cpp b/runtime/compiler/runtime/JITServerIProfiler.cpp index 7d36d8634eb..263f10ebb87 100644 --- a/runtime/compiler/runtime/JITServerIProfiler.cpp +++ b/runtime/compiler/runtime/JITServerIProfiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/JITServerIProfiler.hpp" diff --git a/runtime/compiler/runtime/JITServerIProfiler.hpp b/runtime/compiler/runtime/JITServerIProfiler.hpp index 5df977cb86e..b07e1ca8830 100644 --- a/runtime/compiler/runtime/JITServerIProfiler.hpp +++ b/runtime/compiler/runtime/JITServerIProfiler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_IPROFILER_HPP diff --git a/runtime/compiler/runtime/JITServerROMClassHash.cpp b/runtime/compiler/runtime/JITServerROMClassHash.cpp index 3a8f603162b..a32d2aeb4a8 100644 --- a/runtime/compiler/runtime/JITServerROMClassHash.cpp +++ b/runtime/compiler/runtime/JITServerROMClassHash.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "net/LoadSSLLibs.hpp" diff --git a/runtime/compiler/runtime/JITServerROMClassHash.hpp b/runtime/compiler/runtime/JITServerROMClassHash.hpp index a2410d9742a..cc8e97da3d3 100644 --- a/runtime/compiler/runtime/JITServerROMClassHash.hpp +++ b/runtime/compiler/runtime/JITServerROMClassHash.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_ROMCLASS_HASH_H #define JITSERVER_ROMCLASS_HASH_H diff --git a/runtime/compiler/runtime/JITServerSharedROMClassCache.cpp b/runtime/compiler/runtime/JITServerSharedROMClassCache.cpp index 9bc6ddad535..be814e6b551 100644 --- a/runtime/compiler/runtime/JITServerSharedROMClassCache.cpp +++ b/runtime/compiler/runtime/JITServerSharedROMClassCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicSupport.hpp" #include "control/CompilationRuntime.hpp" diff --git a/runtime/compiler/runtime/JITServerSharedROMClassCache.hpp b/runtime/compiler/runtime/JITServerSharedROMClassCache.hpp index 52aca0af13c..0745ba8f23f 100644 --- a/runtime/compiler/runtime/JITServerSharedROMClassCache.hpp +++ b/runtime/compiler/runtime/JITServerSharedROMClassCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_ROMCLASS_CACHE_H #define JITSERVER_ROMCLASS_CACHE_H diff --git a/runtime/compiler/runtime/JITServerStatisticsThread.cpp b/runtime/compiler/runtime/JITServerStatisticsThread.cpp index 3bfd50fb5a2..6a8b8988524 100644 --- a/runtime/compiler/runtime/JITServerStatisticsThread.cpp +++ b/runtime/compiler/runtime/JITServerStatisticsThread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/JITServerStatisticsThread.hpp" diff --git a/runtime/compiler/runtime/JITServerStatisticsThread.hpp b/runtime/compiler/runtime/JITServerStatisticsThread.hpp index a7211aff7cc..27eb88bcc2a 100644 --- a/runtime/compiler/runtime/JITServerStatisticsThread.hpp +++ b/runtime/compiler/runtime/JITServerStatisticsThread.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITSERVER_STATISTICSTHREAD_HPP diff --git a/runtime/compiler/runtime/JitRuntime.cpp b/runtime/compiler/runtime/JitRuntime.cpp index 95b73d0fc0d..44e11350423 100644 --- a/runtime/compiler/runtime/JitRuntime.cpp +++ b/runtime/compiler/runtime/JitRuntime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef WINDOWS diff --git a/runtime/compiler/runtime/Listener.cpp b/runtime/compiler/runtime/Listener.cpp index 72082358dc6..8e04777c1a5 100644 --- a/runtime/compiler/runtime/Listener.cpp +++ b/runtime/compiler/runtime/Listener.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/Listener.hpp b/runtime/compiler/runtime/Listener.hpp index 8bcaae29b29..b454ee7fa8f 100644 --- a/runtime/compiler/runtime/Listener.hpp +++ b/runtime/compiler/runtime/Listener.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LISTENER_HPP diff --git a/runtime/compiler/runtime/MetaData.cpp b/runtime/compiler/runtime/MetaData.cpp index e6a72980343..73d84816562 100644 --- a/runtime/compiler/runtime/MetaData.cpp +++ b/runtime/compiler/runtime/MetaData.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/MetaDataDebug.cpp b/runtime/compiler/runtime/MetaDataDebug.cpp index 828abe944f8..ccb2065ac7b 100644 --- a/runtime/compiler/runtime/MetaDataDebug.cpp +++ b/runtime/compiler/runtime/MetaDataDebug.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/runtime/MethodExceptionData.hpp b/runtime/compiler/runtime/MethodExceptionData.hpp index d4bee93949a..65d18aa3e0f 100644 --- a/runtime/compiler/runtime/MethodExceptionData.hpp +++ b/runtime/compiler/runtime/MethodExceptionData.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OMR_METHODEXCEPTIONDATA_INCL diff --git a/runtime/compiler/runtime/MethodMetaData.c b/runtime/compiler/runtime/MethodMetaData.c index 1f9d6357ba7..cf758d9aeec 100644 --- a/runtime/compiler/runtime/MethodMetaData.c +++ b/runtime/compiler/runtime/MethodMetaData.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/MethodMetaData.h" diff --git a/runtime/compiler/runtime/MethodMetaData.h b/runtime/compiler/runtime/MethodMetaData.h index 7896633e76f..cb3da75148e 100644 --- a/runtime/compiler/runtime/MethodMetaData.h +++ b/runtime/compiler/runtime/MethodMetaData.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef methodmetadata_h diff --git a/runtime/compiler/runtime/MetricsServer.cpp b/runtime/compiler/runtime/MetricsServer.cpp index a4ea1c66e2c..791ef2bff3b 100644 --- a/runtime/compiler/runtime/MetricsServer.cpp +++ b/runtime/compiler/runtime/MetricsServer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/compiler/runtime/MetricsServer.hpp b/runtime/compiler/runtime/MetricsServer.hpp index bae51503def..b062d5bf07f 100644 --- a/runtime/compiler/runtime/MetricsServer.hpp +++ b/runtime/compiler/runtime/MetricsServer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef METRICSSERVER_HPP diff --git a/runtime/compiler/runtime/RelocationRecord.cpp b/runtime/compiler/runtime/RelocationRecord.cpp index f799d2533eb..d5dc24e965d 100644 --- a/runtime/compiler/runtime/RelocationRecord.cpp +++ b/runtime/compiler/runtime/RelocationRecord.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/RelocationRecord.hpp b/runtime/compiler/runtime/RelocationRecord.hpp index d12db0a3006..c6459a0df8a 100644 --- a/runtime/compiler/runtime/RelocationRecord.hpp +++ b/runtime/compiler/runtime/RelocationRecord.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // diff --git a/runtime/compiler/runtime/RelocationRuntime.cpp b/runtime/compiler/runtime/RelocationRuntime.cpp index b437c0274b7..836e65146e7 100644 --- a/runtime/compiler/runtime/RelocationRuntime.cpp +++ b/runtime/compiler/runtime/RelocationRuntime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/RelocationRuntime.hpp b/runtime/compiler/runtime/RelocationRuntime.hpp index 125f6e29037..40b59c6795d 100644 --- a/runtime/compiler/runtime/RelocationRuntime.hpp +++ b/runtime/compiler/runtime/RelocationRuntime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RELOCATION_RUNTIME_INCL diff --git a/runtime/compiler/runtime/RelocationRuntimeLogger.cpp b/runtime/compiler/runtime/RelocationRuntimeLogger.cpp index da2cd7f3249..b8d5917b4b6 100644 --- a/runtime/compiler/runtime/RelocationRuntimeLogger.cpp +++ b/runtime/compiler/runtime/RelocationRuntimeLogger.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/RelocationRuntimeLogger.hpp" diff --git a/runtime/compiler/runtime/RelocationRuntimeLogger.hpp b/runtime/compiler/runtime/RelocationRuntimeLogger.hpp index fb620157f9f..57eac19ebd9 100644 --- a/runtime/compiler/runtime/RelocationRuntimeLogger.hpp +++ b/runtime/compiler/runtime/RelocationRuntimeLogger.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RELOCATION_RUNTIME_LOGGER_INCL diff --git a/runtime/compiler/runtime/RelocationTarget.cpp b/runtime/compiler/runtime/RelocationTarget.cpp index b03ac5f556a..e8d43fb888e 100644 --- a/runtime/compiler/runtime/RelocationTarget.cpp +++ b/runtime/compiler/runtime/RelocationTarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/RelocationTarget.hpp" diff --git a/runtime/compiler/runtime/RelocationTarget.hpp b/runtime/compiler/runtime/RelocationTarget.hpp index 2a295ebfc11..f2e621cbe0b 100644 --- a/runtime/compiler/runtime/RelocationTarget.hpp +++ b/runtime/compiler/runtime/RelocationTarget.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RELOCATION_TARGET_INCL diff --git a/runtime/compiler/runtime/Runtime.cpp b/runtime/compiler/runtime/Runtime.cpp index d67357078a3..b2ac842f58b 100644 --- a/runtime/compiler/runtime/Runtime.cpp +++ b/runtime/compiler/runtime/Runtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef TR_HOST_X86 diff --git a/runtime/compiler/runtime/RuntimeAssumptions.cpp b/runtime/compiler/runtime/RuntimeAssumptions.cpp index 93b3cd11887..bc455acd813 100644 --- a/runtime/compiler/runtime/RuntimeAssumptions.cpp +++ b/runtime/compiler/runtime/RuntimeAssumptions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/RuntimeAssumptions.hpp" diff --git a/runtime/compiler/runtime/RuntimeAssumptions.hpp b/runtime/compiler/runtime/RuntimeAssumptions.hpp index 5ba56116779..1bc0de48ddf 100644 --- a/runtime/compiler/runtime/RuntimeAssumptions.hpp +++ b/runtime/compiler/runtime/RuntimeAssumptions.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIME_ASSUMPTIONS_INCL diff --git a/runtime/compiler/runtime/SignalHandler.c b/runtime/compiler/runtime/SignalHandler.c index 33c36ca0f02..cdcdab5fe7f 100644 --- a/runtime/compiler/runtime/SignalHandler.c +++ b/runtime/compiler/runtime/SignalHandler.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/compiler/runtime/SymbolValidationManager.cpp b/runtime/compiler/runtime/SymbolValidationManager.cpp index 1f82b6706dd..267b96e6c0d 100644 --- a/runtime/compiler/runtime/SymbolValidationManager.cpp +++ b/runtime/compiler/runtime/SymbolValidationManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/SymbolValidationManager.hpp b/runtime/compiler/runtime/SymbolValidationManager.hpp index e1bf7acd45c..8c2d924ed87 100644 --- a/runtime/compiler/runtime/SymbolValidationManager.hpp +++ b/runtime/compiler/runtime/SymbolValidationManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SYMBOL_VALIDATION_MANAGER_INCL diff --git a/runtime/compiler/runtime/Trampoline.cpp b/runtime/compiler/runtime/Trampoline.cpp index fe879b50471..b04b1d4b746 100644 --- a/runtime/compiler/runtime/Trampoline.cpp +++ b/runtime/compiler/runtime/Trampoline.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/runtime/ValueProfiler.cpp b/runtime/compiler/runtime/ValueProfiler.cpp index 7f394c90621..32428ee0eea 100644 --- a/runtime/compiler/runtime/ValueProfiler.cpp +++ b/runtime/compiler/runtime/ValueProfiler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/runtime/asmprotos.h b/runtime/compiler/runtime/asmprotos.h index 4a7b75b3383..fd314e928b5 100644 --- a/runtime/compiler/runtime/asmprotos.h +++ b/runtime/compiler/runtime/asmprotos.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ASMPROTOS_H diff --git a/runtime/compiler/runtime/codertinit.cpp b/runtime/compiler/runtime/codertinit.cpp index 4e57932b13f..94ccfeb7011 100644 --- a/runtime/compiler/runtime/codertinit.cpp +++ b/runtime/compiler/runtime/codertinit.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "runtime/codertinit.hpp" diff --git a/runtime/compiler/runtime/codertinit.hpp b/runtime/compiler/runtime/codertinit.hpp index 47d79be76b0..472b90f023f 100644 --- a/runtime/compiler/runtime/codertinit.hpp +++ b/runtime/compiler/runtime/codertinit.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/runtime/emfloat.c b/runtime/compiler/runtime/emfloat.c index 09d318ea39b..c9f8e4ad816 100644 --- a/runtime/compiler/runtime/emfloat.c +++ b/runtime/compiler/runtime/emfloat.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/compiler/runtime/emfloat.h b/runtime/compiler/runtime/emfloat.h index e3ef3e82518..5b2aaa349fe 100644 --- a/runtime/compiler/runtime/emfloat.h +++ b/runtime/compiler/runtime/emfloat.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/tools/avgCompTime.pl b/runtime/compiler/tools/avgCompTime.pl index 915116441f2..14d6fb626ad 100644 --- a/runtime/compiler/tools/avgCompTime.pl +++ b/runtime/compiler/tools/avgCompTime.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## #script to compute the average compilation time for methods in the vlog diff --git a/runtime/compiler/x/CMakeLists.txt b/runtime/compiler/x/CMakeLists.txt index 16eeb06cd69..40f4b1d2412 100644 --- a/runtime/compiler/x/CMakeLists.txt +++ b/runtime/compiler/x/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(TR_HOST_ARCH STREQUAL "x") diff --git a/runtime/compiler/x/amd64/CMakeLists.txt b/runtime/compiler/x/amd64/CMakeLists.txt index ed31a1aca99..d20cc127e34 100644 --- a/runtime/compiler/x/amd64/CMakeLists.txt +++ b/runtime/compiler/x/amd64/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(TR_HOST_ARCH STREQUAL "x") diff --git a/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.cpp b/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.cpp index ad71b661717..af7bd018763 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.cpp +++ b/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/amd64/codegen/AMD64GuardedDevirtualSnippet.hpp" diff --git a/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.hpp b/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.hpp index c25b4ac032e..7480947b91f 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.hpp +++ b/runtime/compiler/x/amd64/codegen/AMD64GuardedDevirtualSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AMD64GUARDEDDEVIRTUALSNIPPET_INCL diff --git a/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.cpp b/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.cpp index d0b17a86d07..1924323db4c 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.cpp +++ b/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AMD64J9SystemLinkage.hpp" diff --git a/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.hpp b/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.hpp index 7888458cec2..4e041025984 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.hpp +++ b/runtime/compiler/x/amd64/codegen/AMD64J9SystemLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(AMD64J9SYSTEMLINKAGE_INCL) diff --git a/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.cpp b/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.cpp index ce551b6e4a5..b111fea81be 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.cpp +++ b/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef TR_TARGET_64BIT diff --git a/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.hpp b/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.hpp index dbe637aa6cf..2b91867ba7d 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.hpp +++ b/runtime/compiler/x/amd64/codegen/AMD64JNILinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AMD64_JNILINKAGE_INCL diff --git a/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.cpp b/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.cpp index e799ebacec9..c9a9734e80c 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.cpp +++ b/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef TR_TARGET_64BIT diff --git a/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.hpp b/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.hpp index 3e3c7a27043..2eb15b717ba 100644 --- a/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.hpp +++ b/runtime/compiler/x/amd64/codegen/AMD64PrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AMD64LINKAGE_INCL diff --git a/runtime/compiler/x/amd64/codegen/CMakeLists.txt b/runtime/compiler/x/amd64/codegen/CMakeLists.txt index 53a0d72048b..74513145f2d 100644 --- a/runtime/compiler/x/amd64/codegen/CMakeLists.txt +++ b/runtime/compiler/x/amd64/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp b/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp index 88f64ae67c7..e243f813255 100644 --- a/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/x/amd64/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/runtime/compiler/x/amd64/codegen/J9CodeGenerator.hpp b/runtime/compiler/x/amd64/codegen/J9CodeGenerator.hpp index cb90f31ca8d..ab1d578a439 100644 --- a/runtime/compiler/x/amd64/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/x/amd64/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_AMD64_CODEGENERATOR_INCL diff --git a/runtime/compiler/x/amd64/codegen/J9TreeEvaluator.hpp b/runtime/compiler/x/amd64/codegen/J9TreeEvaluator.hpp index c69e8738394..c1037835687 100644 --- a/runtime/compiler/x/amd64/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/x/amd64/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_AMD64_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/x/amd64/runtime/.gitignore b/runtime/compiler/x/amd64/runtime/.gitignore index db9c9e10560..5ef9891d9b5 100644 --- a/runtime/compiler/x/amd64/runtime/.gitignore +++ b/runtime/compiler/x/amd64/runtime/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /AMD64CompressString.s /AMD64Recompilation.s diff --git a/runtime/compiler/x/amd64/runtime/AMD64CompressString.inc b/runtime/compiler/x/amd64/runtime/AMD64CompressString.inc index 11444dd8bdf..95155a14b7b 100644 --- a/runtime/compiler/x/amd64/runtime/AMD64CompressString.inc +++ b/runtime/compiler/x/amd64/runtime/AMD64CompressString.inc @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 segment .text diff --git a/runtime/compiler/x/amd64/runtime/AMD64CompressString.nasm b/runtime/compiler/x/amd64/runtime/AMD64CompressString.nasm index 36b16deee78..87ac61c0e16 100644 --- a/runtime/compiler/x/amd64/runtime/AMD64CompressString.nasm +++ b/runtime/compiler/x/amd64/runtime/AMD64CompressString.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 or Apache-2.0 or GPL-2.0 WITH Classpath-exception-2.0 or LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifdef TR_HOST_64BIT %include "jilconsts.inc" diff --git a/runtime/compiler/x/amd64/runtime/AMD64Recompilation.nasm b/runtime/compiler/x/amd64/runtime/AMD64Recompilation.nasm index 3734b0ad922..c8dfcc65081 100644 --- a/runtime/compiler/x/amd64/runtime/AMD64Recompilation.nasm +++ b/runtime/compiler/x/amd64/runtime/AMD64Recompilation.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifdef TR_HOST_64BIT diff --git a/runtime/compiler/x/amd64/runtime/CMakeLists.txt b/runtime/compiler/x/amd64/runtime/CMakeLists.txt index 5ccfe85a89b..3c2080cf726 100644 --- a/runtime/compiler/x/amd64/runtime/CMakeLists.txt +++ b/runtime/compiler/x/amd64/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/x/codegen/AllocPrefetchSnippet.cpp b/runtime/compiler/x/codegen/AllocPrefetchSnippet.cpp index aebe2126187..2548d5d495c 100644 --- a/runtime/compiler/x/codegen/AllocPrefetchSnippet.cpp +++ b/runtime/compiler/x/codegen/AllocPrefetchSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/AllocPrefetchSnippet.hpp" diff --git a/runtime/compiler/x/codegen/AllocPrefetchSnippet.hpp b/runtime/compiler/x/codegen/AllocPrefetchSnippet.hpp index 3eb3c5edff6..a55ba2845f4 100644 --- a/runtime/compiler/x/codegen/AllocPrefetchSnippet.hpp +++ b/runtime/compiler/x/codegen/AllocPrefetchSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32ALLOCPREFETCHSNIPPET_INCL diff --git a/runtime/compiler/x/codegen/CMakeLists.txt b/runtime/compiler/x/codegen/CMakeLists.txt index a0edc2e5265..60f51e059df 100644 --- a/runtime/compiler/x/codegen/CMakeLists.txt +++ b/runtime/compiler/x/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/x/codegen/CallSnippet.cpp b/runtime/compiler/x/codegen/CallSnippet.cpp index 3246537e184..ef1eab7da12 100644 --- a/runtime/compiler/x/codegen/CallSnippet.cpp +++ b/runtime/compiler/x/codegen/CallSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/CallSnippet.hpp" diff --git a/runtime/compiler/x/codegen/CallSnippet.hpp b/runtime/compiler/x/codegen/CallSnippet.hpp index 526e2a17b02..a166e4dad22 100644 --- a/runtime/compiler/x/codegen/CallSnippet.hpp +++ b/runtime/compiler/x/codegen/CallSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86CALLSNIPPET_INCL diff --git a/runtime/compiler/x/codegen/CheckFailureSnippet.cpp b/runtime/compiler/x/codegen/CheckFailureSnippet.cpp index 3478c8220bd..359b5260abd 100644 --- a/runtime/compiler/x/codegen/CheckFailureSnippet.cpp +++ b/runtime/compiler/x/codegen/CheckFailureSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/CheckFailureSnippet.hpp" diff --git a/runtime/compiler/x/codegen/CheckFailureSnippet.hpp b/runtime/compiler/x/codegen/CheckFailureSnippet.hpp index 62e782c82d4..7d3b873e8fb 100644 --- a/runtime/compiler/x/codegen/CheckFailureSnippet.hpp +++ b/runtime/compiler/x/codegen/CheckFailureSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86CHECKFAILURESNIPPET_INCL diff --git a/runtime/compiler/x/codegen/ForceRecompilationSnippet.cpp b/runtime/compiler/x/codegen/ForceRecompilationSnippet.cpp index 7b1f20011af..d910668a34d 100644 --- a/runtime/compiler/x/codegen/ForceRecompilationSnippet.cpp +++ b/runtime/compiler/x/codegen/ForceRecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/ForceRecompilationSnippet.hpp" diff --git a/runtime/compiler/x/codegen/ForceRecompilationSnippet.hpp b/runtime/compiler/x/codegen/ForceRecompilationSnippet.hpp index d3905b68ab2..cfdb92bfc2d 100644 --- a/runtime/compiler/x/codegen/ForceRecompilationSnippet.hpp +++ b/runtime/compiler/x/codegen/ForceRecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32FORCERECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/x/codegen/GuardedDevirtualSnippet.cpp b/runtime/compiler/x/codegen/GuardedDevirtualSnippet.cpp index 16f13411663..f7f67465962 100644 --- a/runtime/compiler/x/codegen/GuardedDevirtualSnippet.cpp +++ b/runtime/compiler/x/codegen/GuardedDevirtualSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/GuardedDevirtualSnippet.hpp" diff --git a/runtime/compiler/x/codegen/GuardedDevirtualSnippet.hpp b/runtime/compiler/x/codegen/GuardedDevirtualSnippet.hpp index 05a164456a1..932c30ebd5b 100644 --- a/runtime/compiler/x/codegen/GuardedDevirtualSnippet.hpp +++ b/runtime/compiler/x/codegen/GuardedDevirtualSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GUARDEDDEVIRTUALSNIPPET_INCL diff --git a/runtime/compiler/x/codegen/Instruction.hpp b/runtime/compiler/x/codegen/Instruction.hpp index 17406fbc2e3..c1fef802182 100644 --- a/runtime/compiler/x/codegen/Instruction.hpp +++ b/runtime/compiler/x/codegen/Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRJ9_X86_INSTRUCTION_INCL diff --git a/runtime/compiler/x/codegen/J9AheadOfTimeCompile.cpp b/runtime/compiler/x/codegen/J9AheadOfTimeCompile.cpp index a177bb76adf..8031f626ccc 100644 --- a/runtime/compiler/x/codegen/J9AheadOfTimeCompile.cpp +++ b/runtime/compiler/x/codegen/J9AheadOfTimeCompile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/x/codegen/J9AheadOfTimeCompile.hpp b/runtime/compiler/x/codegen/J9AheadOfTimeCompile.hpp index ea928c9e71b..60fc58bbebd 100644 --- a/runtime/compiler/x/codegen/J9AheadOfTimeCompile.hpp +++ b/runtime/compiler/x/codegen/J9AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_AHEADOFTIMECOMPILE_INCL diff --git a/runtime/compiler/x/codegen/J9CodeGenerator.cpp b/runtime/compiler/x/codegen/J9CodeGenerator.cpp index c1c86d24cea..1890bc02cad 100644 --- a/runtime/compiler/x/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/x/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/AheadOfTimeCompile.hpp" diff --git a/runtime/compiler/x/codegen/J9CodeGenerator.hpp b/runtime/compiler/x/codegen/J9CodeGenerator.hpp index ee1df11ede7..699c1db4896 100644 --- a/runtime/compiler/x/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/x/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_CODEGENERATOR_INCL diff --git a/runtime/compiler/x/codegen/J9InstructionDelegate.hpp b/runtime/compiler/x/codegen/J9InstructionDelegate.hpp index 642f13827bc..6db7a4c146c 100644 --- a/runtime/compiler/x/codegen/J9InstructionDelegate.hpp +++ b/runtime/compiler/x/codegen/J9InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/x/codegen/J9Linkage.cpp b/runtime/compiler/x/codegen/J9Linkage.cpp index 0ceeaa09d01..7bde45e1182 100644 --- a/runtime/compiler/x/codegen/J9Linkage.cpp +++ b/runtime/compiler/x/codegen/J9Linkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/runtime/compiler/x/codegen/J9Linkage.hpp b/runtime/compiler/x/codegen/J9Linkage.hpp index 58746fe9c4d..ecc695775b6 100644 --- a/runtime/compiler/x/codegen/J9Linkage.hpp +++ b/runtime/compiler/x/codegen/J9Linkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_LINKAGE_INCL diff --git a/runtime/compiler/x/codegen/J9LinkageUtils.cpp b/runtime/compiler/x/codegen/J9LinkageUtils.cpp index b35b6a84f18..8c656578d80 100644 --- a/runtime/compiler/x/codegen/J9LinkageUtils.cpp +++ b/runtime/compiler/x/codegen/J9LinkageUtils.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage_inlines.hpp" diff --git a/runtime/compiler/x/codegen/J9LinkageUtils.hpp b/runtime/compiler/x/codegen/J9LinkageUtils.hpp index b3c1cb5bcb1..4e138abd885 100644 --- a/runtime/compiler/x/codegen/J9LinkageUtils.hpp +++ b/runtime/compiler/x/codegen/J9LinkageUtils.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_LINKAGEUTILS_INCL diff --git a/runtime/compiler/x/codegen/J9Snippet.cpp b/runtime/compiler/x/codegen/J9Snippet.cpp index 3b8a7742949..7024abcd248 100644 --- a/runtime/compiler/x/codegen/J9Snippet.cpp +++ b/runtime/compiler/x/codegen/J9Snippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/runtime/compiler/x/codegen/J9Snippet.hpp b/runtime/compiler/x/codegen/J9Snippet.hpp index 3e9e0b3c7c9..e1a6d6912e8 100644 --- a/runtime/compiler/x/codegen/J9Snippet.hpp +++ b/runtime/compiler/x/codegen/J9Snippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_SNIPPET_INCL diff --git a/runtime/compiler/x/codegen/J9TreeEvaluator.cpp b/runtime/compiler/x/codegen/J9TreeEvaluator.cpp index 1d3a9ce97a6..598e1b24992 100644 --- a/runtime/compiler/x/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/x/codegen/J9TreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/x/codegen/J9TreeEvaluator.hpp b/runtime/compiler/x/codegen/J9TreeEvaluator.hpp index 09424a5e979..4796c8506f0 100644 --- a/runtime/compiler/x/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/x/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.cpp b/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.cpp index bac14b531d8..71717cba0f7 100644 --- a/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.cpp +++ b/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/UnresolvedDataSnippet.hpp" diff --git a/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.hpp b/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.hpp index bbeabc2f2a7..0aed0e32c83 100644 --- a/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.hpp +++ b/runtime/compiler/x/codegen/J9UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86UNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/x/codegen/J9X86Instruction.cpp b/runtime/compiler/x/codegen/J9X86Instruction.cpp index 132c3c2a42f..e168cd17802 100644 --- a/runtime/compiler/x/codegen/J9X86Instruction.cpp +++ b/runtime/compiler/x/codegen/J9X86Instruction.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/compiler/x/codegen/J9X86Instruction.hpp b/runtime/compiler/x/codegen/J9X86Instruction.hpp index 685081a0802..bf080c52b66 100644 --- a/runtime/compiler/x/codegen/J9X86Instruction.hpp +++ b/runtime/compiler/x/codegen/J9X86Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86INSTRUCTION_INCL diff --git a/runtime/compiler/x/codegen/Linkage.hpp b/runtime/compiler/x/codegen/Linkage.hpp index 15a14a4ae25..a15b8ce7d0a 100644 --- a/runtime/compiler/x/codegen/Linkage.hpp +++ b/runtime/compiler/x/codegen/Linkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/runtime/compiler/x/codegen/MonitorSnippet.hpp b/runtime/compiler/x/codegen/MonitorSnippet.hpp index d0690675536..77080eacdea 100644 --- a/runtime/compiler/x/codegen/MonitorSnippet.hpp +++ b/runtime/compiler/x/codegen/MonitorSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86MONITORSNIPPET_INCL diff --git a/runtime/compiler/x/codegen/RecompilationSnippet.cpp b/runtime/compiler/x/codegen/RecompilationSnippet.cpp index 438a1af4145..51883d4c638 100644 --- a/runtime/compiler/x/codegen/RecompilationSnippet.cpp +++ b/runtime/compiler/x/codegen/RecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/RecompilationSnippet.hpp" diff --git a/runtime/compiler/x/codegen/RecompilationSnippet.hpp b/runtime/compiler/x/codegen/RecompilationSnippet.hpp index e76b6db2ec5..229aa6af911 100644 --- a/runtime/compiler/x/codegen/RecompilationSnippet.hpp +++ b/runtime/compiler/x/codegen/RecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32RECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/x/codegen/X86HelperLinkage.cpp b/runtime/compiler/x/codegen/X86HelperLinkage.cpp index fa003d03803..7011f373c6a 100644 --- a/runtime/compiler/x/codegen/X86HelperLinkage.cpp +++ b/runtime/compiler/x/codegen/X86HelperLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/X86HelperLinkage.hpp" diff --git a/runtime/compiler/x/codegen/X86HelperLinkage.hpp b/runtime/compiler/x/codegen/X86HelperLinkage.hpp index 8ebd3dd50f5..0b9ee928804 100644 --- a/runtime/compiler/x/codegen/X86HelperLinkage.hpp +++ b/runtime/compiler/x/codegen/X86HelperLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86_HELPERLINKAGE_INCL diff --git a/runtime/compiler/x/codegen/X86Instruction.hpp b/runtime/compiler/x/codegen/X86Instruction.hpp index 1b9513a41d0..446f955f2a9 100644 --- a/runtime/compiler/x/codegen/X86Instruction.hpp +++ b/runtime/compiler/x/codegen/X86Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_X86INSTRUCTION_INCL diff --git a/runtime/compiler/x/codegen/X86PrivateLinkage.cpp b/runtime/compiler/x/codegen/X86PrivateLinkage.cpp index e5b7478d863..a544afca9fa 100644 --- a/runtime/compiler/x/codegen/X86PrivateLinkage.cpp +++ b/runtime/compiler/x/codegen/X86PrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/X86PrivateLinkage.hpp" diff --git a/runtime/compiler/x/codegen/X86PrivateLinkage.hpp b/runtime/compiler/x/codegen/X86PrivateLinkage.hpp index 500586cdcbb..538b45eb56c 100644 --- a/runtime/compiler/x/codegen/X86PrivateLinkage.hpp +++ b/runtime/compiler/x/codegen/X86PrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86PRIVATELINKAGE_INCL diff --git a/runtime/compiler/x/codegen/X86Recompilation.cpp b/runtime/compiler/x/codegen/X86Recompilation.cpp index 29cfd6cffcc..248709a20e3 100644 --- a/runtime/compiler/x/codegen/X86Recompilation.cpp +++ b/runtime/compiler/x/codegen/X86Recompilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/X86Recompilation.hpp" diff --git a/runtime/compiler/x/codegen/X86Recompilation.hpp b/runtime/compiler/x/codegen/X86Recompilation.hpp index e7868b8fd60..839e453e459 100644 --- a/runtime/compiler/x/codegen/X86Recompilation.hpp +++ b/runtime/compiler/x/codegen/X86Recompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86RECOMPILATION_INCL diff --git a/runtime/compiler/x/env/J9CPU.cpp b/runtime/compiler/x/env/J9CPU.cpp index b51346458b3..ba3c3b06c67 100644 --- a/runtime/compiler/x/env/J9CPU.cpp +++ b/runtime/compiler/x/env/J9CPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "compile/Compilation.hpp" diff --git a/runtime/compiler/x/env/J9CPU.hpp b/runtime/compiler/x/env/J9CPU.hpp index 5cb7c5fcd02..c671e334ae3 100644 --- a/runtime/compiler/x/env/J9CPU.hpp +++ b/runtime/compiler/x/env/J9CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_X86_CPU_INCL diff --git a/runtime/compiler/x/i386/CMakeLists.txt b/runtime/compiler/x/i386/CMakeLists.txt index 3c0bc5af3e7..6fa947e7761 100644 --- a/runtime/compiler/x/i386/CMakeLists.txt +++ b/runtime/compiler/x/i386/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(TR_HOST_ARCH STREQUAL "x") diff --git a/runtime/compiler/x/i386/codegen/CMakeLists.txt b/runtime/compiler/x/i386/codegen/CMakeLists.txt index 2d3f494f051..ec23c4d1fd0 100644 --- a/runtime/compiler/x/i386/codegen/CMakeLists.txt +++ b/runtime/compiler/x/i386/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.cpp b/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.cpp index d4523c508e8..e7ca5a817f8 100644 --- a/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.cpp +++ b/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(TR_TARGET_32BIT) diff --git a/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.hpp b/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.hpp index 89cd0ee08ea..90b8c6ca145 100644 --- a/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.hpp +++ b/runtime/compiler/x/i386/codegen/IA32J9SystemLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32J9SYSTEMLINKAGE_INCL diff --git a/runtime/compiler/x/i386/codegen/IA32JNILinkage.cpp b/runtime/compiler/x/i386/codegen/IA32JNILinkage.cpp index 12976b637fd..7e83290eed5 100644 --- a/runtime/compiler/x/i386/codegen/IA32JNILinkage.cpp +++ b/runtime/compiler/x/i386/codegen/IA32JNILinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(TR_TARGET_32BIT) diff --git a/runtime/compiler/x/i386/codegen/IA32JNILinkage.hpp b/runtime/compiler/x/i386/codegen/IA32JNILinkage.hpp index f4bb1ada991..7b11cfaa5f8 100644 --- a/runtime/compiler/x/i386/codegen/IA32JNILinkage.hpp +++ b/runtime/compiler/x/i386/codegen/IA32JNILinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32_JNILINKAGE_INCL diff --git a/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.cpp b/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.cpp index 5908b6b4ae7..8d5279a8582 100644 --- a/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.cpp +++ b/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/IA32PrivateLinkage.hpp" diff --git a/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.hpp b/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.hpp index 1ecbbc8b80b..bad46613e84 100644 --- a/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.hpp +++ b/runtime/compiler/x/i386/codegen/IA32PrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IA32LINKAGE_INCL diff --git a/runtime/compiler/x/i386/codegen/J9CodeGenerator.cpp b/runtime/compiler/x/i386/codegen/J9CodeGenerator.cpp index 8bb66d207ed..49f2e7be8aa 100644 --- a/runtime/compiler/x/i386/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/x/i386/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/CodeGenerator.hpp" diff --git a/runtime/compiler/x/i386/codegen/J9CodeGenerator.hpp b/runtime/compiler/x/i386/codegen/J9CodeGenerator.hpp index 21fba35468a..a7b696334dc 100644 --- a/runtime/compiler/x/i386/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/x/i386/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_I386_CODEGENERATOR_INCL diff --git a/runtime/compiler/x/i386/codegen/J9TreeEvaluator.hpp b/runtime/compiler/x/i386/codegen/J9TreeEvaluator.hpp index 66c0cbde638..c076f65460c 100644 --- a/runtime/compiler/x/i386/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/x/i386/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_I386_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/x/i386/runtime/.gitignore b/runtime/compiler/x/i386/runtime/.gitignore index 099df227a39..09402e1636a 100644 --- a/runtime/compiler/x/i386/runtime/.gitignore +++ b/runtime/compiler/x/i386/runtime/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /J9IA32CompressString.s /J9IA32Math64.s diff --git a/runtime/compiler/x/i386/runtime/CMakeLists.txt b/runtime/compiler/x/i386/runtime/CMakeLists.txt index cb3d7c45081..1e247c44f34 100644 --- a/runtime/compiler/x/i386/runtime/CMakeLists.txt +++ b/runtime/compiler/x/i386/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/x/i386/runtime/IA32CompressString.inc b/runtime/compiler/x/i386/runtime/IA32CompressString.inc index 4abd96e263e..c193ab90a85 100644 --- a/runtime/compiler/x/i386/runtime/IA32CompressString.inc +++ b/runtime/compiler/x/i386/runtime/IA32CompressString.inc @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 segment .text diff --git a/runtime/compiler/x/i386/runtime/IA32Math64.inc b/runtime/compiler/x/i386/runtime/IA32Math64.inc index 312c7a83dd6..911c9f836b1 100644 --- a/runtime/compiler/x/i386/runtime/IA32Math64.inc +++ b/runtime/compiler/x/i386/runtime/IA32Math64.inc @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %include "jilconsts.inc" diff --git a/runtime/compiler/x/i386/runtime/IA32Recompilation.nasm b/runtime/compiler/x/i386/runtime/IA32Recompilation.nasm index 5b868b8c236..aea1cd90fce 100644 --- a/runtime/compiler/x/i386/runtime/IA32Recompilation.nasm +++ b/runtime/compiler/x/i386/runtime/IA32Recompilation.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifndef TR_HOST_64BIT diff --git a/runtime/compiler/x/i386/runtime/J9IA32CompressString.nasm b/runtime/compiler/x/i386/runtime/J9IA32CompressString.nasm index a8cebc48797..a92a0cb209b 100644 --- a/runtime/compiler/x/i386/runtime/J9IA32CompressString.nasm +++ b/runtime/compiler/x/i386/runtime/J9IA32CompressString.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifndef TR_HOST_64BIT diff --git a/runtime/compiler/x/i386/runtime/J9IA32Math64.nasm b/runtime/compiler/x/i386/runtime/J9IA32Math64.nasm index 0063f444637..336862af1d3 100644 --- a/runtime/compiler/x/i386/runtime/J9IA32Math64.nasm +++ b/runtime/compiler/x/i386/runtime/J9IA32Math64.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifndef TR_HOST_64BIT diff --git a/runtime/compiler/x/runtime/.gitignore b/runtime/compiler/x/runtime/.gitignore index 43af0226271..62fa885b13a 100644 --- a/runtime/compiler/x/runtime/.gitignore +++ b/runtime/compiler/x/runtime/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /X86CPUID.s /X86Codert.s diff --git a/runtime/compiler/x/runtime/CMakeLists.txt b/runtime/compiler/x/runtime/CMakeLists.txt index 0fba72c7ea5..a80b59adefe 100644 --- a/runtime/compiler/x/runtime/CMakeLists.txt +++ b/runtime/compiler/x/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/x/runtime/Recomp.cpp b/runtime/compiler/x/runtime/Recomp.cpp index ea1742786ed..612a1f921ee 100644 --- a/runtime/compiler/x/runtime/Recomp.cpp +++ b/runtime/compiler/x/runtime/Recomp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/codegen/X86Recompilation.hpp" diff --git a/runtime/compiler/x/runtime/X86ArrayTranslate.nasm b/runtime/compiler/x/runtime/X86ArrayTranslate.nasm index e498568081e..de7358d55d3 100644 --- a/runtime/compiler/x/runtime/X86ArrayTranslate.nasm +++ b/runtime/compiler/x/runtime/X86ArrayTranslate.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %include "jilconsts.inc" diff --git a/runtime/compiler/x/runtime/X86Codert.nasm b/runtime/compiler/x/runtime/X86Codert.nasm index 6169f732be6..ad7b38a3222 100644 --- a/runtime/compiler/x/runtime/X86Codert.nasm +++ b/runtime/compiler/x/runtime/X86Codert.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %include "jilconsts.inc" diff --git a/runtime/compiler/x/runtime/X86EncodeUTF16.nasm b/runtime/compiler/x/runtime/X86EncodeUTF16.nasm index 853d6f02279..8095f5faf67 100644 --- a/runtime/compiler/x/runtime/X86EncodeUTF16.nasm +++ b/runtime/compiler/x/runtime/X86EncodeUTF16.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 SURROGATE_MASK equ 0f800h SURROGATE_MASK32 equ 0f800f800h diff --git a/runtime/compiler/x/runtime/X86LockReservation.nasm b/runtime/compiler/x/runtime/X86LockReservation.nasm index 67705fd16bd..be0b88de48a 100644 --- a/runtime/compiler/x/runtime/X86LockReservation.nasm +++ b/runtime/compiler/x/runtime/X86LockReservation.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %include "jilconsts.inc" diff --git a/runtime/compiler/x/runtime/X86PicBuilder.inc b/runtime/compiler/x/runtime/X86PicBuilder.inc index 191fa75207e..3f4ab88d7e1 100644 --- a/runtime/compiler/x/runtime/X86PicBuilder.inc +++ b/runtime/compiler/x/runtime/X86PicBuilder.inc @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ; -------------------------------------------------------------------------------- diff --git a/runtime/compiler/x/runtime/X86PicBuilder.nasm b/runtime/compiler/x/runtime/X86PicBuilder.nasm index 9791936b2f6..cabcbf1934d 100644 --- a/runtime/compiler/x/runtime/X86PicBuilder.nasm +++ b/runtime/compiler/x/runtime/X86PicBuilder.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifndef TR_HOST_64BIT diff --git a/runtime/compiler/x/runtime/X86RelocationTarget.cpp b/runtime/compiler/x/runtime/X86RelocationTarget.cpp index 36ba35f2850..ea26bb9e409 100644 --- a/runtime/compiler/x/runtime/X86RelocationTarget.cpp +++ b/runtime/compiler/x/runtime/X86RelocationTarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "x/runtime/X86RelocationTarget.hpp" diff --git a/runtime/compiler/x/runtime/X86RelocationTarget.hpp b/runtime/compiler/x/runtime/X86RelocationTarget.hpp index ffd671c0618..513686c8f80 100644 --- a/runtime/compiler/x/runtime/X86RelocationTarget.hpp +++ b/runtime/compiler/x/runtime/X86RelocationTarget.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef X86RELOCATION_TARGET_INCL diff --git a/runtime/compiler/x/runtime/X86Unresolveds.nasm b/runtime/compiler/x/runtime/X86Unresolveds.nasm index f6f00829ac6..48e936090a5 100644 --- a/runtime/compiler/x/runtime/X86Unresolveds.nasm +++ b/runtime/compiler/x/runtime/X86Unresolveds.nasm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 %ifndef TR_HOST_64BIT diff --git a/runtime/compiler/z/CMakeLists.txt b/runtime/compiler/z/CMakeLists.txt index eb674a5ccfe..57342b54956 100644 --- a/runtime/compiler/z/CMakeLists.txt +++ b/runtime/compiler/z/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Manage cross compilation here: diff --git a/runtime/compiler/z/codegen/CMakeLists.txt b/runtime/compiler/z/codegen/CMakeLists.txt index bb23a43a8a1..6996ef4e531 100644 --- a/runtime/compiler/z/codegen/CMakeLists.txt +++ b/runtime/compiler/z/codegen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/z/codegen/CodeGenPhaseToPerform.hpp b/runtime/compiler/z/codegen/CodeGenPhaseToPerform.hpp index 848ec942917..ac7e346a242 100644 --- a/runtime/compiler/z/codegen/CodeGenPhaseToPerform.hpp +++ b/runtime/compiler/z/codegen/CodeGenPhaseToPerform.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/z/codegen/ForceRecompilationSnippet.cpp b/runtime/compiler/z/codegen/ForceRecompilationSnippet.cpp index 69e8ac0d3b9..15b560414ea 100644 --- a/runtime/compiler/z/codegen/ForceRecompilationSnippet.cpp +++ b/runtime/compiler/z/codegen/ForceRecompilationSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/ForceRecompilationSnippet.hpp" diff --git a/runtime/compiler/z/codegen/ForceRecompilationSnippet.hpp b/runtime/compiler/z/codegen/ForceRecompilationSnippet.hpp index 81675e9fe05..93c5d8ca670 100644 --- a/runtime/compiler/z/codegen/ForceRecompilationSnippet.hpp +++ b/runtime/compiler/z/codegen/ForceRecompilationSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390FORCERECOMPILATIONSNIPPET_INCL diff --git a/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.cpp b/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.cpp index a60daba2022..46f711e9b1c 100644 --- a/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.cpp +++ b/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/InMemoryLoadStoreMarking.hpp" diff --git a/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.hpp b/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.hpp index b1e24329bc8..b3732ae4335 100644 --- a/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.hpp +++ b/runtime/compiler/z/codegen/InMemoryLoadStoreMarking.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef IN_MEM_LOAD_STORE_MARK_INCL diff --git a/runtime/compiler/z/codegen/Instruction.hpp b/runtime/compiler/z/codegen/Instruction.hpp index 41345d26071..e025229c3ac 100644 --- a/runtime/compiler/z/codegen/Instruction.hpp +++ b/runtime/compiler/z/codegen/Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_INSTRUCTION_INCL diff --git a/runtime/compiler/z/codegen/J9AheadOfTimeCompile.cpp b/runtime/compiler/z/codegen/J9AheadOfTimeCompile.cpp index d2a72f52a01..524a04c664c 100644 --- a/runtime/compiler/z/codegen/J9AheadOfTimeCompile.cpp +++ b/runtime/compiler/z/codegen/J9AheadOfTimeCompile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"TRJ9ZAOTComp#C") diff --git a/runtime/compiler/z/codegen/J9AheadOfTimeCompile.hpp b/runtime/compiler/z/codegen/J9AheadOfTimeCompile.hpp index fd9ed436d30..db1d6ef5bc4 100644 --- a/runtime/compiler/z/codegen/J9AheadOfTimeCompile.hpp +++ b/runtime/compiler/z/codegen/J9AheadOfTimeCompile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_AHEADOFTIMECOMPILE_INCL diff --git a/runtime/compiler/z/codegen/J9BCDTreeEvaluator.cpp b/runtime/compiler/z/codegen/J9BCDTreeEvaluator.cpp index cacc4fccbaa..95043923f93 100644 --- a/runtime/compiler/z/codegen/J9BCDTreeEvaluator.cpp +++ b/runtime/compiler/z/codegen/J9BCDTreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/runtime/compiler/z/codegen/J9CodeGenPhase.cpp b/runtime/compiler/z/codegen/J9CodeGenPhase.cpp index 5443b4210b0..9288f22c792 100644 --- a/runtime/compiler/z/codegen/J9CodeGenPhase.cpp +++ b/runtime/compiler/z/codegen/J9CodeGenPhase.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/runtime/compiler/z/codegen/J9CodeGenPhase.hpp b/runtime/compiler/z/codegen/J9CodeGenPhase.hpp index 613d87c79a2..732d9051b21 100644 --- a/runtime/compiler/z/codegen/J9CodeGenPhase.hpp +++ b/runtime/compiler/z/codegen/J9CodeGenPhase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_CODEGEN_PHASE diff --git a/runtime/compiler/z/codegen/J9CodeGenPhaseEnum.hpp b/runtime/compiler/z/codegen/J9CodeGenPhaseEnum.hpp index d1a3d566868..8d66014f2f2 100644 --- a/runtime/compiler/z/codegen/J9CodeGenPhaseEnum.hpp +++ b/runtime/compiler/z/codegen/J9CodeGenPhaseEnum.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/z/codegen/J9CodeGenPhaseFunctionTable.hpp b/runtime/compiler/z/codegen/J9CodeGenPhaseFunctionTable.hpp index db1f19ebdee..75310b93a52 100644 --- a/runtime/compiler/z/codegen/J9CodeGenPhaseFunctionTable.hpp +++ b/runtime/compiler/z/codegen/J9CodeGenPhaseFunctionTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/compiler/z/codegen/J9CodeGenerator.cpp b/runtime/compiler/z/codegen/J9CodeGenerator.cpp index 3b1292caa4b..e9e5aaaecdf 100644 --- a/runtime/compiler/z/codegen/J9CodeGenerator.cpp +++ b/runtime/compiler/z/codegen/J9CodeGenerator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/runtime/compiler/z/codegen/J9CodeGenerator.hpp b/runtime/compiler/z/codegen/J9CodeGenerator.hpp index bf2c37741c7..b456eb1d26a 100644 --- a/runtime/compiler/z/codegen/J9CodeGenerator.hpp +++ b/runtime/compiler/z/codegen/J9CodeGenerator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_CODEGENERATOR_INCL diff --git a/runtime/compiler/z/codegen/J9Instruction.cpp b/runtime/compiler/z/codegen/J9Instruction.cpp index 5e6473178bf..2bf90caeb17 100644 --- a/runtime/compiler/z/codegen/J9Instruction.cpp +++ b/runtime/compiler/z/codegen/J9Instruction.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/runtime/compiler/z/codegen/J9Instruction.hpp b/runtime/compiler/z/codegen/J9Instruction.hpp index d623b56e2d5..06edc7af205 100644 --- a/runtime/compiler/z/codegen/J9Instruction.hpp +++ b/runtime/compiler/z/codegen/J9Instruction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9Z_INSTRUCTIONBASE_INCL diff --git a/runtime/compiler/z/codegen/J9InstructionDelegate.hpp b/runtime/compiler/z/codegen/J9InstructionDelegate.hpp index cd06565a86f..0041780293c 100644 --- a/runtime/compiler/z/codegen/J9InstructionDelegate.hpp +++ b/runtime/compiler/z/codegen/J9InstructionDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_INSTRUCTIONDELEGATE_INCL diff --git a/runtime/compiler/z/codegen/J9Linkage.cpp b/runtime/compiler/z/codegen/J9Linkage.cpp index 859edfb2611..6715c9981e6 100644 --- a/runtime/compiler/z/codegen/J9Linkage.cpp +++ b/runtime/compiler/z/codegen/J9Linkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/runtime/compiler/z/codegen/J9Linkage.hpp b/runtime/compiler/z/codegen/J9Linkage.hpp index 3e2e5353dc8..99f4735047f 100644 --- a/runtime/compiler/z/codegen/J9Linkage.hpp +++ b/runtime/compiler/z/codegen/J9Linkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_LINKAGE_INCL diff --git a/runtime/compiler/z/codegen/J9MemoryReference.cpp b/runtime/compiler/z/codegen/J9MemoryReference.cpp index 53c462b416f..bb088b41f01 100644 --- a/runtime/compiler/z/codegen/J9MemoryReference.cpp +++ b/runtime/compiler/z/codegen/J9MemoryReference.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"TRJ9MRBase#C") diff --git a/runtime/compiler/z/codegen/J9MemoryReference.hpp b/runtime/compiler/z/codegen/J9MemoryReference.hpp index 626f2f31b13..a7c5168cfea 100644 --- a/runtime/compiler/z/codegen/J9MemoryReference.hpp +++ b/runtime/compiler/z/codegen/J9MemoryReference.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_MEMORY_REFERENCE_INCL diff --git a/runtime/compiler/z/codegen/J9Peephole.cpp b/runtime/compiler/z/codegen/J9Peephole.cpp index f58b4c11f93..b517f826f7d 100644 --- a/runtime/compiler/z/codegen/J9Peephole.cpp +++ b/runtime/compiler/z/codegen/J9Peephole.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"TRJ9PeepholeBase#C") diff --git a/runtime/compiler/z/codegen/J9Peephole.hpp b/runtime/compiler/z/codegen/J9Peephole.hpp index 78117d6395b..feff2321976 100644 --- a/runtime/compiler/z/codegen/J9Peephole.hpp +++ b/runtime/compiler/z/codegen/J9Peephole.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_PEEPHOLE_INCL diff --git a/runtime/compiler/z/codegen/J9S390Snippet.cpp b/runtime/compiler/z/codegen/J9S390Snippet.cpp index 7cc9c242354..a1753709a86 100644 --- a/runtime/compiler/z/codegen/J9S390Snippet.cpp +++ b/runtime/compiler/z/codegen/J9S390Snippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/J9S390Snippet.hpp" diff --git a/runtime/compiler/z/codegen/J9S390Snippet.hpp b/runtime/compiler/z/codegen/J9S390Snippet.hpp index efea9eb5898..483e356d63e 100644 --- a/runtime/compiler/z/codegen/J9S390Snippet.hpp +++ b/runtime/compiler/z/codegen/J9S390Snippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9S390SNIPPET_INCL diff --git a/runtime/compiler/z/codegen/J9Snippet.hpp b/runtime/compiler/z/codegen/J9Snippet.hpp index ba8d5ebcd23..53f0edc4e42 100644 --- a/runtime/compiler/z/codegen/J9Snippet.hpp +++ b/runtime/compiler/z/codegen/J9Snippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_SNIPPET_INCL diff --git a/runtime/compiler/z/codegen/J9SystemLinkageLinux.cpp b/runtime/compiler/z/codegen/J9SystemLinkageLinux.cpp index c481352afa5..b867bb15388 100644 --- a/runtime/compiler/z/codegen/J9SystemLinkageLinux.cpp +++ b/runtime/compiler/z/codegen/J9SystemLinkageLinux.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/J9SystemLinkageLinux.hpp" diff --git a/runtime/compiler/z/codegen/J9SystemLinkageLinux.hpp b/runtime/compiler/z/codegen/J9SystemLinkageLinux.hpp index a24b68e982f..9a8976a6356 100644 --- a/runtime/compiler/z/codegen/J9SystemLinkageLinux.hpp +++ b/runtime/compiler/z/codegen/J9SystemLinkageLinux.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_SYSTEMLINKAGELINUX_INCL diff --git a/runtime/compiler/z/codegen/J9SystemLinkagezOS.cpp b/runtime/compiler/z/codegen/J9SystemLinkagezOS.cpp index ab21bb094cd..c5001d0f8a8 100644 --- a/runtime/compiler/z/codegen/J9SystemLinkagezOS.cpp +++ b/runtime/compiler/z/codegen/J9SystemLinkagezOS.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/J9SystemLinkagezOS.hpp" diff --git a/runtime/compiler/z/codegen/J9SystemLinkagezOS.hpp b/runtime/compiler/z/codegen/J9SystemLinkagezOS.hpp index 16e6fdcf8b6..bf92c006b71 100644 --- a/runtime/compiler/z/codegen/J9SystemLinkagezOS.hpp +++ b/runtime/compiler/z/codegen/J9SystemLinkagezOS.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_SYSTEMLINKAGEZOS_INCL diff --git a/runtime/compiler/z/codegen/J9TreeEvaluator.cpp b/runtime/compiler/z/codegen/J9TreeEvaluator.cpp index ab5cc22efc5..acf18bc2409 100644 --- a/runtime/compiler/z/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/z/codegen/J9TreeEvaluator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //On zOS XLC linker can't handle files with same name at link time diff --git a/runtime/compiler/z/codegen/J9TreeEvaluator.hpp b/runtime/compiler/z/codegen/J9TreeEvaluator.hpp index 17faeb02df4..05fa08f51e8 100644 --- a/runtime/compiler/z/codegen/J9TreeEvaluator.hpp +++ b/runtime/compiler/z/codegen/J9TreeEvaluator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_TREE_EVALUATOR_INCL diff --git a/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.cpp b/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.cpp index c2bfa046170..4e35aa3f4a7 100644 --- a/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.cpp +++ b/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"J9ZUnresolvedDataSnippet#C") diff --git a/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.hpp b/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.hpp index 3b5b0227ecb..3db8181317b 100644 --- a/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.hpp +++ b/runtime/compiler/z/codegen/J9UnresolvedDataSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_ZUNRESOLVEDDATASNIPPET_INCL diff --git a/runtime/compiler/z/codegen/J9ZSnippet.cpp b/runtime/compiler/z/codegen/J9ZSnippet.cpp index 32d806adc80..581cadd60d6 100644 --- a/runtime/compiler/z/codegen/J9ZSnippet.cpp +++ b/runtime/compiler/z/codegen/J9ZSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Snippet.hpp" diff --git a/runtime/compiler/z/codegen/Linkage.hpp b/runtime/compiler/z/codegen/Linkage.hpp index 285b156bdf6..65b84ece6cc 100644 --- a/runtime/compiler/z/codegen/Linkage.hpp +++ b/runtime/compiler/z/codegen/Linkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_LINKAGE_INCL diff --git a/runtime/compiler/z/codegen/MemoryReference.hpp b/runtime/compiler/z/codegen/MemoryReference.hpp index 8c7c1ec90ed..509209892f4 100644 --- a/runtime/compiler/z/codegen/MemoryReference.hpp +++ b/runtime/compiler/z/codegen/MemoryReference.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_MEMORYREFERENCE_INCL diff --git a/runtime/compiler/z/codegen/Peephole.hpp b/runtime/compiler/z/codegen/Peephole.hpp index ffe52c6e509..f4f815c2d04 100644 --- a/runtime/compiler/z/codegen/Peephole.hpp +++ b/runtime/compiler/z/codegen/Peephole.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_PEEPHOLE_INCL diff --git a/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.cpp b/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.cpp index 065a0ba2940..e216889fb9e 100644 --- a/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.cpp +++ b/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/ReduceSynchronizedFieldLoad.hpp" diff --git a/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.hpp b/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.hpp index 763de6959eb..619273b5964 100644 --- a/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.hpp +++ b/runtime/compiler/z/codegen/ReduceSynchronizedFieldLoad.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REDUCE_SYNCHRONIZED_FIELD_LOAD_NODE diff --git a/runtime/compiler/z/codegen/S390AOTRelocation.cpp b/runtime/compiler/z/codegen/S390AOTRelocation.cpp index 09946bf58bc..a94c8f8d6bb 100644 --- a/runtime/compiler/z/codegen/S390AOTRelocation.cpp +++ b/runtime/compiler/z/codegen/S390AOTRelocation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390AOTRelocation.hpp" diff --git a/runtime/compiler/z/codegen/S390AOTRelocation.hpp b/runtime/compiler/z/codegen/S390AOTRelocation.hpp index 4de22798fa1..35c10bb0a3c 100644 --- a/runtime/compiler/z/codegen/S390AOTRelocation.hpp +++ b/runtime/compiler/z/codegen/S390AOTRelocation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9AOTRELOCATION_INCL diff --git a/runtime/compiler/z/codegen/S390CHelperLinkage.cpp b/runtime/compiler/z/codegen/S390CHelperLinkage.cpp index 6fa2802f919..53e105591fa 100644 --- a/runtime/compiler/z/codegen/S390CHelperLinkage.cpp +++ b/runtime/compiler/z/codegen/S390CHelperLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/S390CHelperLinkage.hpp" diff --git a/runtime/compiler/z/codegen/S390CHelperLinkage.hpp b/runtime/compiler/z/codegen/S390CHelperLinkage.hpp index 6ce6f066d2d..6de4402685b 100644 --- a/runtime/compiler/z/codegen/S390CHelperLinkage.hpp +++ b/runtime/compiler/z/codegen/S390CHelperLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/Linkage.hpp" diff --git a/runtime/compiler/z/codegen/S390J9CallSnippet.cpp b/runtime/compiler/z/codegen/S390J9CallSnippet.cpp index 6f7996c35b9..0bba3109e46 100644 --- a/runtime/compiler/z/codegen/S390J9CallSnippet.cpp +++ b/runtime/compiler/z/codegen/S390J9CallSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390J9CallSnippet.hpp" diff --git a/runtime/compiler/z/codegen/S390J9CallSnippet.hpp b/runtime/compiler/z/codegen/S390J9CallSnippet.hpp index 65ff860bd23..ae31bbe57c2 100644 --- a/runtime/compiler/z/codegen/S390J9CallSnippet.hpp +++ b/runtime/compiler/z/codegen/S390J9CallSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TR_S390J9CALLSNIPPET_INCL diff --git a/runtime/compiler/z/codegen/S390PrivateLinkage.cpp b/runtime/compiler/z/codegen/S390PrivateLinkage.cpp index ac91277d46a..a83170a3826 100644 --- a/runtime/compiler/z/codegen/S390PrivateLinkage.cpp +++ b/runtime/compiler/z/codegen/S390PrivateLinkage.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/S390PrivateLinkage.hpp" diff --git a/runtime/compiler/z/codegen/S390PrivateLinkage.hpp b/runtime/compiler/z/codegen/S390PrivateLinkage.hpp index ea236a28631..dcb37c08083 100644 --- a/runtime/compiler/z/codegen/S390PrivateLinkage.hpp +++ b/runtime/compiler/z/codegen/S390PrivateLinkage.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390PRIVATELINKAGE_INCL diff --git a/runtime/compiler/z/codegen/S390Recompilation.cpp b/runtime/compiler/z/codegen/S390Recompilation.cpp index a2699a104c1..77db1c6cc6a 100644 --- a/runtime/compiler/z/codegen/S390Recompilation.cpp +++ b/runtime/compiler/z/codegen/S390Recompilation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390Recompilation.hpp" diff --git a/runtime/compiler/z/codegen/S390Recompilation.hpp b/runtime/compiler/z/codegen/S390Recompilation.hpp index 3a1a91fcb19..588d9eb06b6 100644 --- a/runtime/compiler/z/codegen/S390Recompilation.hpp +++ b/runtime/compiler/z/codegen/S390Recompilation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390RECOMPILATION_INCL diff --git a/runtime/compiler/z/codegen/S390Register.cpp b/runtime/compiler/z/codegen/S390Register.cpp index 795e37d856d..bea9f60370d 100644 --- a/runtime/compiler/z/codegen/S390Register.cpp +++ b/runtime/compiler/z/codegen/S390Register.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390Register.hpp" diff --git a/runtime/compiler/z/codegen/S390Register.hpp b/runtime/compiler/z/codegen/S390Register.hpp index e31c408a2e4..04e3ea61871 100644 --- a/runtime/compiler/z/codegen/S390Register.hpp +++ b/runtime/compiler/z/codegen/S390Register.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390REGISTER_INCL diff --git a/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.cpp b/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.cpp index ebde22e917f..d2dd9269d8c 100644 --- a/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.cpp +++ b/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390StackCheckFailureSnippet.hpp" diff --git a/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.hpp b/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.hpp index 2315819fb0d..1dfec8e4600 100644 --- a/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.hpp +++ b/runtime/compiler/z/codegen/S390StackCheckFailureSnippet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390STACKCHECKFAILURESNIPPET_INCL diff --git a/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.cpp b/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.cpp index e79b84e7a17..8399e7a1b79 100644 --- a/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.cpp +++ b/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "codegen/UncommonBCDCHKAddressNode.hpp" diff --git a/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.hpp b/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.hpp index adaa5a7cac7..96570bdded3 100644 --- a/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.hpp +++ b/runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNCOMMON_BCDCHK_ADDRESS_NODE diff --git a/runtime/compiler/z/env/CMakeLists.txt b/runtime/compiler/z/env/CMakeLists.txt index e911f05f097..27f1e17f120 100644 --- a/runtime/compiler/z/env/CMakeLists.txt +++ b/runtime/compiler/z/env/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9jit_files( diff --git a/runtime/compiler/z/env/J9CPU.cpp b/runtime/compiler/z/env/J9CPU.cpp index 5305401fe60..aa8193ff530 100644 --- a/runtime/compiler/z/env/J9CPU.cpp +++ b/runtime/compiler/z/env/J9CPU.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma csect(CODE,"J9ZJ9CPU#C") diff --git a/runtime/compiler/z/env/J9CPU.hpp b/runtime/compiler/z/env/J9CPU.hpp index 5d13f4e3fbf..eec65dfb9d5 100644 --- a/runtime/compiler/z/env/J9CPU.hpp +++ b/runtime/compiler/z/env/J9CPU.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_Z_CPU_INCL diff --git a/runtime/compiler/z/runtime/CMakeLists.txt b/runtime/compiler/z/runtime/CMakeLists.txt index 25edd821cd6..a9eb8b60cea 100644 --- a/runtime/compiler/z/runtime/CMakeLists.txt +++ b/runtime/compiler/z/runtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(m4_defs) diff --git a/runtime/compiler/z/runtime/Math.m4 b/runtime/compiler/z/runtime/Math.m4 index aac6b909d7d..c27c5a73ecc 100644 --- a/runtime/compiler/z/runtime/Math.m4 +++ b/runtime/compiler/z/runtime/Math.m4 @@ -24,8 +24,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ZZ =================================================================== diff --git a/runtime/compiler/z/runtime/PicBuilder.m4 b/runtime/compiler/z/runtime/PicBuilder.m4 index f98b133ff30..6a125bdac65 100644 --- a/runtime/compiler/z/runtime/PicBuilder.m4 +++ b/runtime/compiler/z/runtime/PicBuilder.m4 @@ -24,8 +24,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ZZ =================================================================== ZZ The macro at the top replaces ZZ with appropriate line comment diff --git a/runtime/compiler/z/runtime/Recomp.cpp b/runtime/compiler/z/runtime/Recomp.cpp index 7c50e5bac91..aa6966fd0e3 100644 --- a/runtime/compiler/z/runtime/Recomp.cpp +++ b/runtime/compiler/z/runtime/Recomp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/codegen/S390Recompilation.hpp" diff --git a/runtime/compiler/z/runtime/Recompilation.m4 b/runtime/compiler/z/runtime/Recompilation.m4 index 0b6e0ca6e58..cb12ac1e836 100644 --- a/runtime/compiler/z/runtime/Recompilation.m4 +++ b/runtime/compiler/z/runtime/Recompilation.m4 @@ -24,8 +24,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ZZ =================================================================== ZZ The above macro replaces ZZ with appropriate line comment diff --git a/runtime/compiler/z/runtime/S390RelocationTarget.cpp b/runtime/compiler/z/runtime/S390RelocationTarget.cpp index e9aef984885..4cde33460c8 100644 --- a/runtime/compiler/z/runtime/S390RelocationTarget.cpp +++ b/runtime/compiler/z/runtime/S390RelocationTarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "z/runtime/S390RelocationTarget.hpp" diff --git a/runtime/compiler/z/runtime/S390RelocationTarget.hpp b/runtime/compiler/z/runtime/S390RelocationTarget.hpp index 4a772a2273d..a9efafec133 100644 --- a/runtime/compiler/z/runtime/S390RelocationTarget.hpp +++ b/runtime/compiler/z/runtime/S390RelocationTarget.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef S390RELOCATION_TARGET_INCL diff --git a/runtime/compiler/z/runtime/ValueProf.m4 b/runtime/compiler/z/runtime/ValueProf.m4 index aa499b0ee36..dd3b702fef7 100644 --- a/runtime/compiler/z/runtime/ValueProf.m4 +++ b/runtime/compiler/z/runtime/ValueProf.m4 @@ -24,8 +24,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ZZ =================================================================== ZZ jilvalues.m4 is a j9 m4 include that defines offsets of various diff --git a/runtime/compiler/z/runtime/s390_asdef.inc b/runtime/compiler/z/runtime/s390_asdef.inc index 36fbcd6e15b..63401a7a7e8 100644 --- a/runtime/compiler/z/runtime/s390_asdef.inc +++ b/runtime/compiler/z/runtime/s390_asdef.inc @@ -18,8 +18,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ifdef({TR_HOST_64BIT},{dnl diff --git a/runtime/compiler/z/runtime/s390_macros.inc b/runtime/compiler/z/runtime/s390_macros.inc index d7e69d9ad22..fa403da17f4 100644 --- a/runtime/compiler/z/runtime/s390_macros.inc +++ b/runtime/compiler/z/runtime/s390_macros.inc @@ -18,8 +18,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ifdef({J9ZOS390},{dnl diff --git a/runtime/compiler/z/runtime/s390m4check.c b/runtime/compiler/z/runtime/s390m4check.c index e79cdbbd993..d087c63a720 100644 --- a/runtime/compiler/z/runtime/s390m4check.c +++ b/runtime/compiler/z/runtime/s390m4check.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This program takes as input the file *.m4 and *.s and generates diff --git a/runtime/compiler/z/runtime/zLinux_macros.inc b/runtime/compiler/z/runtime/zLinux_macros.inc index 8f0818f495e..52cdc7a85c6 100644 --- a/runtime/compiler/z/runtime/zLinux_macros.inc +++ b/runtime/compiler/z/runtime/zLinux_macros.inc @@ -18,8 +18,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ZZ ============================================================ ZZ Macro library for Testarossa 390 JIT Development diff --git a/runtime/compiler/z/runtime/zOS_macros.inc b/runtime/compiler/z/runtime/zOS_macros.inc index 3a9e593c8b7..9d51cdcc146 100644 --- a/runtime/compiler/z/runtime/zOS_macros.inc +++ b/runtime/compiler/z/runtime/zOS_macros.inc @@ -18,8 +18,8 @@ ZZ [1] https://www.gnu.org/software/classpath/license.html ZZ [2] https://openjdk.org/legal/assembly-exception.html ZZ ZZ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -ZZ GPL-2.0 WITH Classpath-exception-2.0 OR -ZZ LicenseRef-GPL-2.0 WITH Assembly-exception +ZZ GPL-2.0-only WITH Classpath-exception-2.0 OR +ZZ GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ZZ ============================================================ ZZ Macro library for Testarossa 390 JIT Development diff --git a/runtime/criusupport/CMakeLists.txt b/runtime/criusupport/CMakeLists.txt index b7432d36c70..7558ab65d8a 100644 --- a/runtime/criusupport/CMakeLists.txt +++ b/runtime/criusupport/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_tracegen(j9criu.tdf) diff --git a/runtime/criusupport/criusupport.cpp b/runtime/criusupport/criusupport.cpp index 6501d2bd3e5..7c204d7ba09 100644 --- a/runtime/criusupport/criusupport.cpp +++ b/runtime/criusupport/criusupport.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(LINUX) #include diff --git a/runtime/criusupport/criusupport.hpp b/runtime/criusupport/criusupport.hpp index e7a7621ccf4..a48a0e0f50b 100644 --- a/runtime/criusupport/criusupport.hpp +++ b/runtime/criusupport/criusupport.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _Included_org_eclipse_openj9_criu_CRIUSupport diff --git a/runtime/criusupport/exports.cmake b/runtime/criusupport/exports.cmake index a782be720fa..27b42a5a83a 100644 --- a/runtime/criusupport/exports.cmake +++ b/runtime/criusupport/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(J9VM_OPT_CRIU_SUPPORT) diff --git a/runtime/criusupport/j9criu.tdf b/runtime/criusupport/j9criu.tdf index 19f937ce6a7..1493da2974b 100644 --- a/runtime/criusupport/j9criu.tdf +++ b/runtime/criusupport/j9criu.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9criu diff --git a/runtime/criusupport/module.xml b/runtime/criusupport/module.xml index 2cf6c9c627d..fe77be488cf 100644 --- a/runtime/criusupport/module.xml +++ b/runtime/criusupport/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/criusupport/uma/criusupport_exports.xml b/runtime/criusupport/uma/criusupport_exports.xml index 719e424e2d8..e2680f6ca93 100644 --- a/runtime/criusupport/uma/criusupport_exports.xml +++ b/runtime/criusupport/uma/criusupport_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/criusupport/uma/criusupport_objects.xml b/runtime/criusupport/uma/criusupport_objects.xml index 95cbfd2b968..8636cf2885d 100644 --- a/runtime/criusupport/uma/criusupport_objects.xml +++ b/runtime/criusupport/uma/criusupport_objects.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/cuda/.gitignore b/runtime/cuda/.gitignore index 06a7621c8a2..20b3bc25234 100644 --- a/runtime/cuda/.gitignore +++ b/runtime/cuda/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 objects diff --git a/runtime/cuda/CMakeLists.txt b/runtime/cuda/CMakeLists.txt index 5ae863d8fea..8df72f6e511 100644 --- a/runtime/cuda/CMakeLists.txt +++ b/runtime/cuda/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_tracegen(cuda4j.tdf) diff --git a/runtime/cuda/CudaBuffer.cpp b/runtime/cuda/CudaBuffer.cpp index f2e10a1b34c..26c1354c7ec 100644 --- a/runtime/cuda/CudaBuffer.cpp +++ b/runtime/cuda/CudaBuffer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaCommon.cpp b/runtime/cuda/CudaCommon.cpp index 1d398b8e3c3..eb360ce3fe7 100644 --- a/runtime/cuda/CudaCommon.cpp +++ b/runtime/cuda/CudaCommon.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaCommon.hpp b/runtime/cuda/CudaCommon.hpp index 5c04733bd15..e4a565758d7 100644 --- a/runtime/cuda/CudaCommon.hpp +++ b/runtime/cuda/CudaCommon.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _Included_com_ibm_cuda_CudaCommon diff --git a/runtime/cuda/CudaDevice.cpp b/runtime/cuda/CudaDevice.cpp index 57a2cc99215..867ea5f8bd3 100644 --- a/runtime/cuda/CudaDevice.cpp +++ b/runtime/cuda/CudaDevice.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaEvent.cpp b/runtime/cuda/CudaEvent.cpp index aee39a571c8..e8ba451bf57 100644 --- a/runtime/cuda/CudaEvent.cpp +++ b/runtime/cuda/CudaEvent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaFunction.cpp b/runtime/cuda/CudaFunction.cpp index 548efa0cd3a..6f6af4f894c 100644 --- a/runtime/cuda/CudaFunction.cpp +++ b/runtime/cuda/CudaFunction.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaJitOptions.cpp b/runtime/cuda/CudaJitOptions.cpp index d26b1c8350a..a6054d0aff5 100644 --- a/runtime/cuda/CudaJitOptions.cpp +++ b/runtime/cuda/CudaJitOptions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaLinker.cpp b/runtime/cuda/CudaLinker.cpp index a3d5172799b..68b7450af2c 100644 --- a/runtime/cuda/CudaLinker.cpp +++ b/runtime/cuda/CudaLinker.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaModule.cpp b/runtime/cuda/CudaModule.cpp index 4102c6b9651..9defb7cd206 100644 --- a/runtime/cuda/CudaModule.cpp +++ b/runtime/cuda/CudaModule.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/CudaStream.cpp b/runtime/cuda/CudaStream.cpp index f382df0be62..4512f279f6a 100644 --- a/runtime/cuda/CudaStream.cpp +++ b/runtime/cuda/CudaStream.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CudaCommon.hpp" diff --git a/runtime/cuda/cuda4j.tdf b/runtime/cuda/cuda4j.tdf index 639403a3a11..22fd8ee9ac2 100644 --- a/runtime/cuda/cuda4j.tdf +++ b/runtime/cuda/cuda4j.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=cuda4j diff --git a/runtime/cuda/exports.cmake b/runtime/cuda/exports.cmake index 526d32f29fd..6bdc6dc10ae 100644 --- a/runtime/cuda/exports.cmake +++ b/runtime/cuda/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_exports(cuda4j diff --git a/runtime/cuda/exports.xml b/runtime/cuda/exports.xml index 18a8ec98535..6ee3bdddf5d 100644 --- a/runtime/cuda/exports.xml +++ b/runtime/cuda/exports.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/cuda/module.xml b/runtime/cuda/module.xml index 165685e96de..b5fc6a273d1 100644 --- a/runtime/cuda/module.xml +++ b/runtime/cuda/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/dbgext/CMakeLists.txt b/runtime/dbgext/CMakeLists.txt index 15f13f0daf7..cd13aa939df 100644 --- a/runtime/dbgext/CMakeLists.txt +++ b/runtime/dbgext/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/dbgext/dbgext_internal.h b/runtime/dbgext/dbgext_internal.h index a697a3f4784..eb95b82c77f 100644 --- a/runtime/dbgext/dbgext_internal.h +++ b/runtime/dbgext/dbgext_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef dbgext_internal_h diff --git a/runtime/dbgext/dbgpool.c b/runtime/dbgext/dbgpool.c index 734f1092117..a767ea71ea6 100644 --- a/runtime/dbgext/dbgpool.c +++ b/runtime/dbgext/dbgpool.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9dbgext.h" diff --git a/runtime/dbgext/dbgpool.h b/runtime/dbgext/dbgpool.h index 43d65aeed61..bcf147acf29 100644 --- a/runtime/dbgext/dbgpool.h +++ b/runtime/dbgext/dbgpool.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/dbgext/j9dbgext.c b/runtime/dbgext/j9dbgext.c index afc9d9f426d..efe7076797c 100644 --- a/runtime/dbgext/j9dbgext.c +++ b/runtime/dbgext/j9dbgext.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/dbgext/j9dbgext.h b/runtime/dbgext/j9dbgext.h index 6b76ed433d4..0fd798c83eb 100644 --- a/runtime/dbgext/j9dbgext.h +++ b/runtime/dbgext/j9dbgext.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9dbgext_h diff --git a/runtime/dbgext/module.xml b/runtime/dbgext/module.xml index 5bb86208540..ec6f5ab971a 100644 --- a/runtime/dbgext/module.xml +++ b/runtime/dbgext/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/ddr/CMakeLists.txt b/runtime/ddr/CMakeLists.txt index e68a039e005..7a355c76e9c 100644 --- a/runtime/ddr/CMakeLists.txt +++ b/runtime/ddr/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/ddr/algorithm_versions.c b/runtime/ddr/algorithm_versions.c index 9b2ee29ffb7..2845832f6c9 100644 --- a/runtime/ddr/algorithm_versions.c +++ b/runtime/ddr/algorithm_versions.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9ddr.h" diff --git a/runtime/ddr/autoblob_port.mk b/runtime/ddr/autoblob_port.mk index a4659780869..e5acff42c81 100644 --- a/runtime/ddr/autoblob_port.mk +++ b/runtime/ddr/autoblob_port.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### DISABLE_STUBS := 1 diff --git a/runtime/ddr/autoblob_rules.mk b/runtime/ddr/autoblob_rules.mk index 95fd34a55b0..714253a908a 100644 --- a/runtime/ddr/autoblob_rules.mk +++ b/runtime/ddr/autoblob_rules.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Makefile containing the rules for generating DDR blobs automatically. Don't run this directly - it needs to be included in another diff --git a/runtime/ddr/autoblob_vm.mk b/runtime/ddr/autoblob_vm.mk index e35581a33dc..162cabe0d25 100644 --- a/runtime/ddr/autoblob_vm.mk +++ b/runtime/ddr/autoblob_vm.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### DISABLE_STUBS := 1 diff --git a/runtime/ddr/ddr.readme b/runtime/ddr/ddr.readme index d55464b08d1..9a431c526c2 100644 --- a/runtime/ddr/ddr.readme +++ b/runtime/ddr/ddr.readme @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### Notes on DDR Module diff --git a/runtime/ddr/ddr_buildtools.mk b/runtime/ddr/ddr_buildtools.mk index 3c3ae3e73fe..36f3fae8118 100644 --- a/runtime/ddr/ddr_buildtools.mk +++ b/runtime/ddr/ddr_buildtools.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### generate_ddr_blob_c : diff --git a/runtime/ddr/ddr_cpp_headers.mk b/runtime/ddr/ddr_cpp_headers.mk index c56e9008415..1f399eb4442 100644 --- a/runtime/ddr/ddr_cpp_headers.mk +++ b/runtime/ddr/ddr_cpp_headers.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Targets to generate DDR blob C code from C headers automatically. diff --git a/runtime/ddr/ddr_cpp_xlat.sed b/runtime/ddr/ddr_cpp_xlat.sed index dd9dc0a2c70..3e854b6074b 100644 --- a/runtime/ddr/ddr_cpp_xlat.sed +++ b/runtime/ddr/ddr_cpp_xlat.sed @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### 1i\ diff --git a/runtime/ddr/ddr_stubs.mk b/runtime/ddr/ddr_stubs.mk index 370df8023dc..c3a376c90a6 100644 --- a/runtime/ddr/ddr_stubs.mk +++ b/runtime/ddr/ddr_stubs.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ifndef DISABLE_STUBS diff --git a/runtime/ddr/ddrcppsupportblob.cpp.stub b/runtime/ddr/ddrcppsupportblob.cpp.stub index 96b3cb11a32..8811fe0ba7d 100644 --- a/runtime/ddr/ddrcppsupportblob.cpp.stub +++ b/runtime/ddr/ddrcppsupportblob.cpp.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/ddrcppsupportstructs.properties b/runtime/ddr/ddrcppsupportstructs.properties index 82a3371d4e7..fe9d26994ea 100644 --- a/runtime/ddr/ddrcppsupportstructs.properties +++ b/runtime/ddr/ddrcppsupportstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Configuration for J9DDR blob generator. diff --git a/runtime/ddr/ddrhelp.h b/runtime/ddr/ddrhelp.h index cdeb3565164..e25e5db5c18 100644 --- a/runtime/ddr/ddrhelp.h +++ b/runtime/ddr/ddrhelp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DDRHELP_H_ diff --git a/runtime/ddr/ddrmain.c b/runtime/ddr/ddrmain.c index 2ff63993d56..f7891155342 100644 --- a/runtime/ddr/ddrmain.c +++ b/runtime/ddr/ddrmain.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) diff --git a/runtime/ddr/ddrtable.c b/runtime/ddr/ddrtable.c index d7b8af8bfc2..314078d02c1 100644 --- a/runtime/ddr/ddrtable.c +++ b/runtime/ddr/ddrtable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9ddr.h" #include "ddrtable.h" diff --git a/runtime/ddr/ddrtable.h b/runtime/ddr/ddrtable.h index 12fd7ca48a1..11a78fd48f4 100644 --- a/runtime/ddr/ddrtable.h +++ b/runtime/ddr/ddrtable.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ddrtable_h diff --git a/runtime/ddr/dummy_headers/DbgHelp.h b/runtime/ddr/dummy_headers/DbgHelp.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/DbgHelp.h +++ b/runtime/ddr/dummy_headers/DbgHelp.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/arpa/inet.h b/runtime/ddr/dummy_headers/arpa/inet.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/arpa/inet.h +++ b/runtime/ddr/dummy_headers/arpa/inet.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/assert.h b/runtime/ddr/dummy_headers/assert.h index 33dc86421b7..01a20b2c2ee 100644 --- a/runtime/ddr/dummy_headers/assert.h +++ b/runtime/ddr/dummy_headers/assert.h @@ -17,6 +17,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define assert(x) diff --git a/runtime/ddr/dummy_headers/builtins.h b/runtime/ddr/dummy_headers/builtins.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/builtins.h +++ b/runtime/ddr/dummy_headers/builtins.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/ceeedcct.h b/runtime/ddr/dummy_headers/ceeedcct.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/ceeedcct.h +++ b/runtime/ddr/dummy_headers/ceeedcct.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/errno.h b/runtime/ddr/dummy_headers/errno.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/errno.h +++ b/runtime/ddr/dummy_headers/errno.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/iconv.h b/runtime/ddr/dummy_headers/iconv.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/iconv.h +++ b/runtime/ddr/dummy_headers/iconv.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/langinfo.h b/runtime/ddr/dummy_headers/langinfo.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/langinfo.h +++ b/runtime/ddr/dummy_headers/langinfo.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/leawi.h b/runtime/ddr/dummy_headers/leawi.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/leawi.h +++ b/runtime/ddr/dummy_headers/leawi.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/limits.h b/runtime/ddr/dummy_headers/limits.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/limits.h +++ b/runtime/ddr/dummy_headers/limits.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/malloc.h b/runtime/ddr/dummy_headers/malloc.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/malloc.h +++ b/runtime/ddr/dummy_headers/malloc.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/memory.h b/runtime/ddr/dummy_headers/memory.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/memory.h +++ b/runtime/ddr/dummy_headers/memory.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/netdb.h b/runtime/ddr/dummy_headers/netdb.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/netdb.h +++ b/runtime/ddr/dummy_headers/netdb.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/netinet/in.h b/runtime/ddr/dummy_headers/netinet/in.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/netinet/in.h +++ b/runtime/ddr/dummy_headers/netinet/in.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/netinet/tcp.h b/runtime/ddr/dummy_headers/netinet/tcp.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/netinet/tcp.h +++ b/runtime/ddr/dummy_headers/netinet/tcp.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/netinet/tcp_var.h b/runtime/ddr/dummy_headers/netinet/tcp_var.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/netinet/tcp_var.h +++ b/runtime/ddr/dummy_headers/netinet/tcp_var.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/new b/runtime/ddr/dummy_headers/new index b3b00455919..992134db73c 100644 --- a/runtime/ddr/dummy_headers/new +++ b/runtime/ddr/dummy_headers/new @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(DDR_DUMMY_NEW_) diff --git a/runtime/ddr/dummy_headers/numa.h b/runtime/ddr/dummy_headers/numa.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/numa.h +++ b/runtime/ddr/dummy_headers/numa.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/pdh.h b/runtime/ddr/dummy_headers/pdh.h index f75511377d5..5ec9ddeef5c 100644 --- a/runtime/ddr/dummy_headers/pdh.h +++ b/runtime/ddr/dummy_headers/pdh.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PDH_H #define PDH_H diff --git a/runtime/ddr/dummy_headers/pdhmsg.h b/runtime/ddr/dummy_headers/pdhmsg.h index ca48bc7f444..7b56a7199d0 100644 --- a/runtime/ddr/dummy_headers/pdhmsg.h +++ b/runtime/ddr/dummy_headers/pdhmsg.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PDHMSG_H #define PDHMSG_H diff --git a/runtime/ddr/dummy_headers/process.h b/runtime/ddr/dummy_headers/process.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/process.h +++ b/runtime/ddr/dummy_headers/process.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/psapi.h b/runtime/ddr/dummy_headers/psapi.h index 5074d0f7c70..70b13560fbf 100644 --- a/runtime/ddr/dummy_headers/psapi.h +++ b/runtime/ddr/dummy_headers/psapi.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PSAPI_H #define PSAPI_H diff --git a/runtime/ddr/dummy_headers/pthread.h b/runtime/ddr/dummy_headers/pthread.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/pthread.h +++ b/runtime/ddr/dummy_headers/pthread.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sched.h b/runtime/ddr/dummy_headers/sched.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sched.h +++ b/runtime/ddr/dummy_headers/sched.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/semaphore.h b/runtime/ddr/dummy_headers/semaphore.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/semaphore.h +++ b/runtime/ddr/dummy_headers/semaphore.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/setjmp.h b/runtime/ddr/dummy_headers/setjmp.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/setjmp.h +++ b/runtime/ddr/dummy_headers/setjmp.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/signal.h b/runtime/ddr/dummy_headers/signal.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/signal.h +++ b/runtime/ddr/dummy_headers/signal.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/stdarg.h b/runtime/ddr/dummy_headers/stdarg.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/stdarg.h +++ b/runtime/ddr/dummy_headers/stdarg.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/stddef.h b/runtime/ddr/dummy_headers/stddef.h index 432f44f0217..b1004de738f 100644 --- a/runtime/ddr/dummy_headers/stddef.h +++ b/runtime/ddr/dummy_headers/stddef.h @@ -17,6 +17,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define offsetof(X,Y) 0 diff --git a/runtime/ddr/dummy_headers/stdint.h b/runtime/ddr/dummy_headers/stdint.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/stdint.h +++ b/runtime/ddr/dummy_headers/stdint.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/stdio.h b/runtime/ddr/dummy_headers/stdio.h index ebd6104ffa5..18ef94c9854 100644 --- a/runtime/ddr/dummy_headers/stdio.h +++ b/runtime/ddr/dummy_headers/stdio.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STDIO_H #define STDIO_H diff --git a/runtime/ddr/dummy_headers/stdlib.h b/runtime/ddr/dummy_headers/stdlib.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/stdlib.h +++ b/runtime/ddr/dummy_headers/stdlib.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/string.h b/runtime/ddr/dummy_headers/string.h index aac9583ad23..b899a8a78bb 100644 --- a/runtime/ddr/dummy_headers/string.h +++ b/runtime/ddr/dummy_headers/string.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sys/select.h b/runtime/ddr/dummy_headers/sys/select.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sys/select.h +++ b/runtime/ddr/dummy_headers/sys/select.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sys/socket.h b/runtime/ddr/dummy_headers/sys/socket.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sys/socket.h +++ b/runtime/ddr/dummy_headers/sys/socket.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sys/socketvar.h b/runtime/ddr/dummy_headers/sys/socketvar.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sys/socketvar.h +++ b/runtime/ddr/dummy_headers/sys/socketvar.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sys/time.h b/runtime/ddr/dummy_headers/sys/time.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sys/time.h +++ b/runtime/ddr/dummy_headers/sys/time.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sys/types.h b/runtime/ddr/dummy_headers/sys/types.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sys/types.h +++ b/runtime/ddr/dummy_headers/sys/types.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/sys/wait.h b/runtime/ddr/dummy_headers/sys/wait.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/sys/wait.h +++ b/runtime/ddr/dummy_headers/sys/wait.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/time.h b/runtime/ddr/dummy_headers/time.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/time.h +++ b/runtime/ddr/dummy_headers/time.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/ucontext.h b/runtime/ddr/dummy_headers/ucontext.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/ucontext.h +++ b/runtime/ddr/dummy_headers/ucontext.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/unistd.h b/runtime/ddr/dummy_headers/unistd.h index fc9972b1d17..6cb19bbb8d5 100644 --- a/runtime/ddr/dummy_headers/unistd.h +++ b/runtime/ddr/dummy_headers/unistd.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNISTD_H diff --git a/runtime/ddr/dummy_headers/windows.h b/runtime/ddr/dummy_headers/windows.h index 968e7fe4d49..b5167fa9509 100644 --- a/runtime/ddr/dummy_headers/windows.h +++ b/runtime/ddr/dummy_headers/windows.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef WINDOWS_H #define WINDOWS_H diff --git a/runtime/ddr/dummy_headers/winsock2.h b/runtime/ddr/dummy_headers/winsock2.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/winsock2.h +++ b/runtime/ddr/dummy_headers/winsock2.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/ws2tcpip.h b/runtime/ddr/dummy_headers/ws2tcpip.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/ws2tcpip.h +++ b/runtime/ddr/dummy_headers/ws2tcpip.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/dummy_headers/xti.h b/runtime/ddr/dummy_headers/xti.h index e2520331e14..88e343000ba 100644 --- a/runtime/ddr/dummy_headers/xti.h +++ b/runtime/ddr/dummy_headers/xti.h @@ -17,5 +17,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/ddr/excludes b/runtime/ddr/excludes index 0083a533b8d..6df659fc3b1 100644 --- a/runtime/ddr/excludes +++ b/runtime/ddr/excludes @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### file: diff --git a/runtime/ddr/gcddr.cpp b/runtime/ddr/gcddr.cpp index 6bada175b3f..2529b3ad637 100644 --- a/runtime/ddr/gcddr.cpp +++ b/runtime/ddr/gcddr.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AllocateDescription.hpp" diff --git a/runtime/ddr/j9ddr.c b/runtime/ddr/j9ddr.c index 0d8f0e6da64..2c73c36462f 100644 --- a/runtime/ddr/j9ddr.c +++ b/runtime/ddr/j9ddr.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/ddr/j9ddr.h b/runtime/ddr/j9ddr.h index a7dd5397866..3efc9f332ba 100644 --- a/runtime/ddr/j9ddr.h +++ b/runtime/ddr/j9ddr.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9ddr_h #define j9ddr_h diff --git a/runtime/ddr/j9portddrblob.c.stub b/runtime/ddr/j9portddrblob.c.stub index 87a20e19c5c..4498095e28e 100644 --- a/runtime/ddr/j9portddrblob.c.stub +++ b/runtime/ddr/j9portddrblob.c.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/j9portddrstructs.properties b/runtime/ddr/j9portddrstructs.properties index 2194dae18ee..b5740d7fe29 100644 --- a/runtime/ddr/j9portddrstructs.properties +++ b/runtime/ddr/j9portddrstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Configuration for J9DDR blob generator. diff --git a/runtime/ddr/jitddrblob.c.stub b/runtime/ddr/jitddrblob.c.stub index 13c14de5eb9..679cb38e88c 100644 --- a/runtime/ddr/jitddrblob.c.stub +++ b/runtime/ddr/jitddrblob.c.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/jitddrstructs.properties b/runtime/ddr/jitddrstructs.properties index 6efc2641059..9f4e93d3e2d 100644 --- a/runtime/ddr/jitddrstructs.properties +++ b/runtime/ddr/jitddrstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Configuration for J9DDR blob generator. diff --git a/runtime/ddr/jitflagsddr.c b/runtime/ddr/jitflagsddr.c index 6e34847180f..5a00f9e127a 100644 --- a/runtime/ddr/jitflagsddr.c +++ b/runtime/ddr/jitflagsddr.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/ddr/module.xml b/runtime/ddr/module.xml index d4262c2aa66..2433e22b7a6 100644 --- a/runtime/ddr/module.xml +++ b/runtime/ddr/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/ddr/omrddr.cpp b/runtime/ddr/omrddr.cpp index 665e80447d7..bf520f5fece 100644 --- a/runtime/ddr/omrddr.cpp +++ b/runtime/ddr/omrddr.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "../compiler/env/defines.h" diff --git a/runtime/ddr/omrddrblob.c.stub b/runtime/ddr/omrddrblob.c.stub index ab4295ced0f..314584d9525 100644 --- a/runtime/ddr/omrddrblob.c.stub +++ b/runtime/ddr/omrddrblob.c.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/omrddrstructs.properties b/runtime/ddr/omrddrstructs.properties index e5811d3abc5..288dbeff5af 100644 --- a/runtime/ddr/omrddrstructs.properties +++ b/runtime/ddr/omrddrstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### ddrblob.name=Omr diff --git a/runtime/ddr/overrides b/runtime/ddr/overrides index 5ba64d33e7a..4dded64ec56 100644 --- a/runtime/ddr/overrides +++ b/runtime/ddr/overrides @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### overrides-compilers diff --git a/runtime/ddr/overrides-compilers b/runtime/ddr/overrides-compilers index 7d5e6ba1481..2512aa1558e 100644 --- a/runtime/ddr/overrides-compilers +++ b/runtime/ddr/overrides-compilers @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Some compilers collapse typedef declarations (e.g. J9SRP to I32). diff --git a/runtime/ddr/overrides-gc b/runtime/ddr/overrides-gc index 0dfe364a082..9b56dbfca27 100644 --- a/runtime/ddr/overrides-gc +++ b/runtime/ddr/overrides-gc @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### typeoverride.MM_AllocateDescription._allocationType=MM_MemorySubSpace$AllocationType diff --git a/runtime/ddr/overrides-jit b/runtime/ddr/overrides-jit index c86b2f2a660..7b513a3c0c4 100644 --- a/runtime/ddr/overrides-jit +++ b/runtime/ddr/overrides-jit @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### typeoverride.TR_InlinedCallSite._methodInfo=void* diff --git a/runtime/ddr/overrides-omr b/runtime/ddr/overrides-omr index 1e5b7a08943..2807da66eaf 100644 --- a/runtime/ddr/overrides-omr +++ b/runtime/ddr/overrides-omr @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### fieldoverride.CLimits.DDR_CHAR_MAX=CHAR_MAX diff --git a/runtime/ddr/overrides-vm b/runtime/ddr/overrides-vm index c7c5ea6e171..70b11c6455d 100644 --- a/runtime/ddr/overrides-vm +++ b/runtime/ddr/overrides-vm @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # formats: diff --git a/runtime/ddr/run_omrddrgen.mk.ftl b/runtime/ddr/run_omrddrgen.mk.ftl index 6cef412fe52..de915940991 100644 --- a/runtime/ddr/run_omrddrgen.mk.ftl +++ b/runtime/ddr/run_omrddrgen.mk.ftl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### TOP_DIR := .. diff --git a/runtime/ddr/sizeofBool.cpp b/runtime/ddr/sizeofBool.cpp index bedfa8413d2..ccc78ac4df9 100644 --- a/runtime/ddr/sizeofBool.cpp +++ b/runtime/ddr/sizeofBool.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/ddr/stackwalkddrblob.c.stub b/runtime/ddr/stackwalkddrblob.c.stub index 7f89721bfdd..16cb49f4405 100644 --- a/runtime/ddr/stackwalkddrblob.c.stub +++ b/runtime/ddr/stackwalkddrblob.c.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/stackwalkddrstructs.properties b/runtime/ddr/stackwalkddrstructs.properties index 8dbc4dc32f2..e643fc34404 100644 --- a/runtime/ddr/stackwalkddrstructs.properties +++ b/runtime/ddr/stackwalkddrstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Configuration for J9DDR blob generator. diff --git a/runtime/ddr/types.cpp b/runtime/ddr/types.cpp index 6480a7e0294..ad86ea8007a 100644 --- a/runtime/ddr/types.cpp +++ b/runtime/ddr/types.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/typestubs.h b/runtime/ddr/typestubs.h index f611ef273c9..4e88814c820 100644 --- a/runtime/ddr/typestubs.h +++ b/runtime/ddr/typestubs.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TYPESTUBS_H #define TYPESTUBS_H diff --git a/runtime/ddr/vmddr.cpp b/runtime/ddr/vmddr.cpp index cfa71ed88d5..11e11f091b4 100644 --- a/runtime/ddr/vmddr.cpp +++ b/runtime/ddr/vmddr.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/vmddrblob.c.stub b/runtime/ddr/vmddrblob.c.stub index ac18b8965db..05f9b36a764 100644 --- a/runtime/ddr/vmddrblob.c.stub +++ b/runtime/ddr/vmddrblob.c.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/ddr/vmddrstructs.properties b/runtime/ddr/vmddrstructs.properties index 81550d2d134..bc56ccd68fc 100644 --- a/runtime/ddr/vmddrstructs.properties +++ b/runtime/ddr/vmddrstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Configuration for J9DDR blob generator. diff --git a/runtime/dfix/dfix-exports.xml b/runtime/dfix/dfix-exports.xml index 89d70466cc2..ffc98146290 100644 --- a/runtime/dfix/dfix-exports.xml +++ b/runtime/dfix/dfix-exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/dfix/dfix-generated.c.ftl b/runtime/dfix/dfix-generated.c.ftl index 203aa0e3282..c4b011b22d2 100644 --- a/runtime/dfix/dfix-generated.c.ftl +++ b/runtime/dfix/dfix-generated.c.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* generated.c */ diff --git a/runtime/dfix/dfix.c b/runtime/dfix/dfix.c index 6fc1b79a206..89e231c3e0b 100644 --- a/runtime/dfix/dfix.c +++ b/runtime/dfix/dfix.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) || defined (WIN64) #include diff --git a/runtime/dfix/dfix.h.ftl b/runtime/dfix/dfix.h.ftl index a93b6c8b47a..a11a62028d2 100644 --- a/runtime/dfix/dfix.h.ftl +++ b/runtime/dfix/dfix.h.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DFIX_H_INCLUDED diff --git a/runtime/dfix/dfix.tdf b/runtime/dfix/dfix.tdf index 97c4cd7adb0..e7f28ad5b15 100644 --- a/runtime/dfix/dfix.tdf +++ b/runtime/dfix/dfix.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9dfix diff --git a/runtime/dfix/dfix_internal.h.ftl b/runtime/dfix/dfix_internal.h.ftl index 5d1e44f616f..b330da4df7a 100644 --- a/runtime/dfix/dfix_internal.h.ftl +++ b/runtime/dfix/dfix_internal.h.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ <#include "dynamic.ftl" > diff --git a/runtime/dfix/dfix_memcpy.c b/runtime/dfix/dfix_memcpy.c index 683e752d375..add6d75ed2b 100644 --- a/runtime/dfix/dfix_memcpy.c +++ b/runtime/dfix/dfix_memcpy.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/dfix/dfix_zero_memory.c b/runtime/dfix/dfix_zero_memory.c index 493a906c10a..bdee69504af 100644 --- a/runtime/dfix/dfix_zero_memory.c +++ b/runtime/dfix/dfix_zero_memory.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/dfix/dynamic.ftl b/runtime/dfix/dynamic.ftl index 44711c2dd60..c2181a998b8 100644 --- a/runtime/dfix/dynamic.ftl +++ b/runtime/dfix/dynamic.ftl @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> <#-- Don't forget to export the function by adding to dfix-exports.xml. --> <#assign functions = diff --git a/runtime/dfix/module.xml b/runtime/dfix/module.xml index 1a19eadfde9..b4a36d3d38b 100644 --- a/runtime/dfix/module.xml +++ b/runtime/dfix/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/dfix/test/CMakeLists.txt b/runtime/dfix/test/CMakeLists.txt index ff8f788fb8a..715556d86e1 100644 --- a/runtime/dfix/test/CMakeLists.txt +++ b/runtime/dfix/test/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(dfixtest diff --git a/runtime/dfix/test/main.cpp b/runtime/dfix/test/main.cpp index 0a621c09cab..a45193edf3a 100644 --- a/runtime/dfix/test/main.cpp +++ b/runtime/dfix/test/main.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/dfix/test/module.xml b/runtime/dfix/test/module.xml index 4a04918b5bb..5aab059ca66 100644 --- a/runtime/dfix/test/module.xml +++ b/runtime/dfix/test/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/exelib/CMakeLists.txt b/runtime/exelib/CMakeLists.txt index a1eb380a9e4..92496824d06 100644 --- a/runtime/exelib/CMakeLists.txt +++ b/runtime/exelib/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/exelib/common/exelib_internal.h b/runtime/exelib/common/exelib_internal.h index 17c9d06ca37..316236e7833 100644 --- a/runtime/exelib/common/exelib_internal.h +++ b/runtime/exelib/common/exelib_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef exelib_internal_h diff --git a/runtime/exelib/common/libargs.c b/runtime/exelib/common/libargs.c index 1d11898c731..9dc9108fc00 100644 --- a/runtime/exelib/common/libargs.c +++ b/runtime/exelib/common/libargs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*------------------------------------------------------------------ diff --git a/runtime/exelib/common/libhlp.c b/runtime/exelib/common/libhlp.c index f805998c1d7..53ac3873ec2 100644 --- a/runtime/exelib/common/libhlp.c +++ b/runtime/exelib/common/libhlp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/exelib/common/memcheck.c b/runtime/exelib/common/memcheck.c index 2809d11290b..a283272eb44 100644 --- a/runtime/exelib/common/memcheck.c +++ b/runtime/exelib/common/memcheck.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/exelib/common/strbuf.c b/runtime/exelib/common/strbuf.c index 71f65cfb1f7..b2a70e645df 100644 --- a/runtime/exelib/common/strbuf.c +++ b/runtime/exelib/common/strbuf.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/exelib/module.xml b/runtime/exelib/module.xml index 7aa1fd34130..47e053bf6e2 100644 --- a/runtime/exelib/module.xml +++ b/runtime/exelib/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc/CMakeLists.txt b/runtime/gc/CMakeLists.txt index fcd02655a73..4f62c058ba3 100644 --- a/runtime/gc/CMakeLists.txt +++ b/runtime/gc/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_sources diff --git a/runtime/gc/dllinit.c b/runtime/gc/dllinit.c index 9a474b7337c..5a18dd7906c 100644 --- a/runtime/gc/dllinit.c +++ b/runtime/gc/dllinit.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc/gctable.c b/runtime/gc/gctable.c index 7751ab3302b..341672dcbaa 100644 --- a/runtime/gc/gctable.c +++ b/runtime/gc/gctable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gc_internal.h" diff --git a/runtime/gc/module.xml b/runtime/gc/module.xml index 3ae91c84836..abe130344cd 100644 --- a/runtime/gc/module.xml +++ b/runtime/gc/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_api/CMakeLists.txt b/runtime/gc_api/CMakeLists.txt index 82989429c6f..0c6cca563a7 100644 --- a/runtime/gc_api/CMakeLists.txt +++ b/runtime/gc_api/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_api_sources diff --git a/runtime/gc_api/GuaranteedNurseryRange.cpp b/runtime/gc_api/GuaranteedNurseryRange.cpp index e06ca702093..b8ac79d4c81 100644 --- a/runtime/gc_api/GuaranteedNurseryRange.cpp +++ b/runtime/gc_api/GuaranteedNurseryRange.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "j9cfg.h" diff --git a/runtime/gc_api/HeapIteratorAPI.cpp b/runtime/gc_api/HeapIteratorAPI.cpp index 5b1c8bff61f..71910a51071 100644 --- a/runtime/gc_api/HeapIteratorAPI.cpp +++ b/runtime/gc_api/HeapIteratorAPI.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_api/HeapIteratorAPIBufferedIterator.cpp b/runtime/gc_api/HeapIteratorAPIBufferedIterator.cpp index 961ee77a7c7..774ebe5cfb2 100644 --- a/runtime/gc_api/HeapIteratorAPIBufferedIterator.cpp +++ b/runtime/gc_api/HeapIteratorAPIBufferedIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_api/HeapIteratorAPIBufferedIterator.hpp b/runtime/gc_api/HeapIteratorAPIBufferedIterator.hpp index c24adedac13..7401ebd484f 100644 --- a/runtime/gc_api/HeapIteratorAPIBufferedIterator.hpp +++ b/runtime/gc_api/HeapIteratorAPIBufferedIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPITERATORAPIBUFFEREDITERATOR_HPP_) diff --git a/runtime/gc_api/HeapIteratorAPIRootIterator.cpp b/runtime/gc_api/HeapIteratorAPIRootIterator.cpp index d4ad0cc972b..a57cd8cdb67 100644 --- a/runtime/gc_api/HeapIteratorAPIRootIterator.cpp +++ b/runtime/gc_api/HeapIteratorAPIRootIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "HeapIteratorAPIRootIterator.hpp" #include "HeapIteratorAPI.h" diff --git a/runtime/gc_api/HeapIteratorAPIRootIterator.hpp b/runtime/gc_api/HeapIteratorAPIRootIterator.hpp index 1415ff2a35a..5c40e57ab3f 100644 --- a/runtime/gc_api/HeapIteratorAPIRootIterator.hpp +++ b/runtime/gc_api/HeapIteratorAPIRootIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef HEAPITERATORAPIROOTITERATOR_HPP_ #define HEAPITERATORAPIROOTITERATOR_HPP_ diff --git a/runtime/gc_api/HeapRootScanner.cpp b/runtime/gc_api/HeapRootScanner.cpp index 6cb6c1ed96d..41f7ddfa0f3 100644 --- a/runtime/gc_api/HeapRootScanner.cpp +++ b/runtime/gc_api/HeapRootScanner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_api/HeapRootScanner.hpp b/runtime/gc_api/HeapRootScanner.hpp index a5c81a9fc3b..33bb7c90487 100644 --- a/runtime/gc_api/HeapRootScanner.hpp +++ b/runtime/gc_api/HeapRootScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPROOTSCANNER_HPP_) #define HEAPROOTSCANNER_HPP_ diff --git a/runtime/gc_api/module.xml b/runtime/gc_api/module.xml index 19b73a39530..d9723593ccd 100644 --- a/runtime/gc_api/module.xml +++ b/runtime/gc_api/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_base/AsyncCallbackHandler.cpp b/runtime/gc_base/AsyncCallbackHandler.cpp index e30ec8cf9ec..285d9c4635f 100644 --- a/runtime/gc_base/AsyncCallbackHandler.cpp +++ b/runtime/gc_base/AsyncCallbackHandler.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/AsyncCallbackHandler.hpp b/runtime/gc_base/AsyncCallbackHandler.hpp index 0c48a0dd685..f642bd39c05 100644 --- a/runtime/gc_base/AsyncCallbackHandler.hpp +++ b/runtime/gc_base/AsyncCallbackHandler.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/CMakeLists.txt b/runtime/gc_base/CMakeLists.txt index 2db38709d9a..170b9a13b73 100644 --- a/runtime/gc_base/CMakeLists.txt +++ b/runtime/gc_base/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_base_sources diff --git a/runtime/gc_base/ClassLoaderLinkedListIterator.cpp b/runtime/gc_base/ClassLoaderLinkedListIterator.cpp index c60c24b56c5..d5579e9ba83 100644 --- a/runtime/gc_base/ClassLoaderLinkedListIterator.cpp +++ b/runtime/gc_base/ClassLoaderLinkedListIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ClassLoaderLinkedListIterator.hpp b/runtime/gc_base/ClassLoaderLinkedListIterator.hpp index 5077fa21f70..3e10096ab81 100644 --- a/runtime/gc_base/ClassLoaderLinkedListIterator.hpp +++ b/runtime/gc_base/ClassLoaderLinkedListIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CLASSLOADERLINKEDLISTITERATOR_HPP_) diff --git a/runtime/gc_base/ClassLoaderManager.cpp b/runtime/gc_base/ClassLoaderManager.cpp index 2b9d3d92354..3510fa2c795 100644 --- a/runtime/gc_base/ClassLoaderManager.cpp +++ b/runtime/gc_base/ClassLoaderManager.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ClassLoaderManager.hpp b/runtime/gc_base/ClassLoaderManager.hpp index 363692ed178..70d4da79b12 100644 --- a/runtime/gc_base/ClassLoaderManager.hpp +++ b/runtime/gc_base/ClassLoaderManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_base/ClassModel.hpp b/runtime/gc_base/ClassModel.hpp index 7abedde478b..7cdfcf9e83b 100644 --- a/runtime/gc_base/ClassModel.hpp +++ b/runtime/gc_base/ClassModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/ContinuationObjectBuffer.cpp b/runtime/gc_base/ContinuationObjectBuffer.cpp index 8b0cfda9747..41cbcedb181 100644 --- a/runtime/gc_base/ContinuationObjectBuffer.cpp +++ b/runtime/gc_base/ContinuationObjectBuffer.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ContinuationObjectBuffer.hpp b/runtime/gc_base/ContinuationObjectBuffer.hpp index f1fda9b30d6..73568978c02 100644 --- a/runtime/gc_base/ContinuationObjectBuffer.hpp +++ b/runtime/gc_base/ContinuationObjectBuffer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONTINUATIONOBJECTBUFFER_HPP_ diff --git a/runtime/gc_base/ContinuationObjectList.cpp b/runtime/gc_base/ContinuationObjectList.cpp index c3f6f0afc28..2c4a6fa0a46 100644 --- a/runtime/gc_base/ContinuationObjectList.cpp +++ b/runtime/gc_base/ContinuationObjectList.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ContinuationObjectList.hpp b/runtime/gc_base/ContinuationObjectList.hpp index 80f126deb22..e9556276866 100644 --- a/runtime/gc_base/ContinuationObjectList.hpp +++ b/runtime/gc_base/ContinuationObjectList.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONTINUATIONOBJECTLIST_HPP_ diff --git a/runtime/gc_base/FinalizableClassLoaderBuffer.hpp b/runtime/gc_base/FinalizableClassLoaderBuffer.hpp index 85433f8584f..0e3d4271167 100644 --- a/runtime/gc_base/FinalizableClassLoaderBuffer.hpp +++ b/runtime/gc_base/FinalizableClassLoaderBuffer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/FinalizableObjectBuffer.hpp b/runtime/gc_base/FinalizableObjectBuffer.hpp index b2eff64e399..65c82e930f6 100644 --- a/runtime/gc_base/FinalizableObjectBuffer.hpp +++ b/runtime/gc_base/FinalizableObjectBuffer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/FinalizableReferenceBuffer.hpp b/runtime/gc_base/FinalizableReferenceBuffer.hpp index f5d1d5ae29d..dc6e2730026 100644 --- a/runtime/gc_base/FinalizableReferenceBuffer.hpp +++ b/runtime/gc_base/FinalizableReferenceBuffer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/FinalizeListManager.cpp b/runtime/gc_base/FinalizeListManager.cpp index 544466f017c..02cd3ab4e0c 100644 --- a/runtime/gc_base/FinalizeListManager.cpp +++ b/runtime/gc_base/FinalizeListManager.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/FinalizeListManager.hpp b/runtime/gc_base/FinalizeListManager.hpp index 9797467922d..390c7b577b5 100644 --- a/runtime/gc_base/FinalizeListManager.hpp +++ b/runtime/gc_base/FinalizeListManager.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/FinalizerSupport.cpp b/runtime/gc_base/FinalizerSupport.cpp index 7490de1944c..423de101894 100644 --- a/runtime/gc_base/FinalizerSupport.cpp +++ b/runtime/gc_base/FinalizerSupport.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/FinalizerSupport.hpp b/runtime/gc_base/FinalizerSupport.hpp index 503328f18a2..f953b53636b 100644 --- a/runtime/gc_base/FinalizerSupport.hpp +++ b/runtime/gc_base/FinalizerSupport.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FINALIZERSUPPORT_HPP diff --git a/runtime/gc_base/GCExtensions.cpp b/runtime/gc_base/GCExtensions.cpp index 48cf78debd0..d10b4457eea 100644 --- a/runtime/gc_base/GCExtensions.cpp +++ b/runtime/gc_base/GCExtensions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "GCExtensions.hpp" diff --git a/runtime/gc_base/GCExtensions.hpp b/runtime/gc_base/GCExtensions.hpp index 173217b6cfe..feb5dcf96b4 100644 --- a/runtime/gc_base/GCExtensions.hpp +++ b/runtime/gc_base/GCExtensions.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/GCObjectEvents.cpp b/runtime/gc_base/GCObjectEvents.cpp index ee6b7ea0ae9..4729d594d0a 100644 --- a/runtime/gc_base/GCObjectEvents.cpp +++ b/runtime/gc_base/GCObjectEvents.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/GCObjectEvents.hpp b/runtime/gc_base/GCObjectEvents.hpp index 22a96b97534..ed2a9335356 100644 --- a/runtime/gc_base/GCObjectEvents.hpp +++ b/runtime/gc_base/GCObjectEvents.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/GenerationalAccessBarrierComponent.cpp b/runtime/gc_base/GenerationalAccessBarrierComponent.cpp index bbfe28fc20d..a6a15e3f6fa 100644 --- a/runtime/gc_base/GenerationalAccessBarrierComponent.cpp +++ b/runtime/gc_base/GenerationalAccessBarrierComponent.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_base/GenerationalAccessBarrierComponent.hpp b/runtime/gc_base/GenerationalAccessBarrierComponent.hpp index cc2326c54a7..21c364cee65 100644 --- a/runtime/gc_base/GenerationalAccessBarrierComponent.hpp +++ b/runtime/gc_base/GenerationalAccessBarrierComponent.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_base/HotFieldUtil.cpp b/runtime/gc_base/HotFieldUtil.cpp index 7e0d687f365..4c074cf86b2 100644 --- a/runtime/gc_base/HotFieldUtil.cpp +++ b/runtime/gc_base/HotFieldUtil.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/HotFieldUtil.hpp b/runtime/gc_base/HotFieldUtil.hpp index 059663fb1f7..edfaf770159 100644 --- a/runtime/gc_base/HotFieldUtil.hpp +++ b/runtime/gc_base/HotFieldUtil.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/IdleGCManager.cpp b/runtime/gc_base/IdleGCManager.cpp index aaf9647174b..a922960b27d 100644 --- a/runtime/gc_base/IdleGCManager.cpp +++ b/runtime/gc_base/IdleGCManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/IdleGCManager.hpp b/runtime/gc_base/IdleGCManager.hpp index c7162a2f6b5..fabf82f609f 100644 --- a/runtime/gc_base/IdleGCManager.hpp +++ b/runtime/gc_base/IdleGCManager.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/IndexableObjectAllocationModel.cpp b/runtime/gc_base/IndexableObjectAllocationModel.cpp index e3f5f066d06..c424f1773a4 100644 --- a/runtime/gc_base/IndexableObjectAllocationModel.cpp +++ b/runtime/gc_base/IndexableObjectAllocationModel.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ArrayletObjectModel.hpp" diff --git a/runtime/gc_base/IndexableObjectAllocationModel.hpp b/runtime/gc_base/IndexableObjectAllocationModel.hpp index 1a6669eff79..3380ffddc7a 100644 --- a/runtime/gc_base/IndexableObjectAllocationModel.hpp +++ b/runtime/gc_base/IndexableObjectAllocationModel.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(INDEXABLEOBJECTALLOCATIONMODEL_HPP_) diff --git a/runtime/gc_base/JavaObjectAllocationModel.hpp b/runtime/gc_base/JavaObjectAllocationModel.hpp index 5b81be50416..3c947b0051b 100644 --- a/runtime/gc_base/JavaObjectAllocationModel.hpp +++ b/runtime/gc_base/JavaObjectAllocationModel.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(JAVAOBJECTALLOCATIONMODEL_HPP_) diff --git a/runtime/gc_base/MixedObjectAllocationModel.hpp b/runtime/gc_base/MixedObjectAllocationModel.hpp index a7e00e7350b..260f5be5695 100644 --- a/runtime/gc_base/MixedObjectAllocationModel.hpp +++ b/runtime/gc_base/MixedObjectAllocationModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MIXEDOBJECTALLOCATIONMODEL_HPP_) diff --git a/runtime/gc_base/ModronTypes.hpp b/runtime/gc_base/ModronTypes.hpp index 861a06107fa..7ec47e33434 100644 --- a/runtime/gc_base/ModronTypes.hpp +++ b/runtime/gc_base/ModronTypes.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/ObjectAccessBarrier.cpp b/runtime/gc_base/ObjectAccessBarrier.cpp index 8205c75f026..8fc1535263a 100644 --- a/runtime/gc_base/ObjectAccessBarrier.cpp +++ b/runtime/gc_base/ObjectAccessBarrier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_base/ObjectAccessBarrier.hpp b/runtime/gc_base/ObjectAccessBarrier.hpp index 44b4e099028..e79ba09f46f 100644 --- a/runtime/gc_base/ObjectAccessBarrier.hpp +++ b/runtime/gc_base/ObjectAccessBarrier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/ObjectCheck.cpp b/runtime/gc_base/ObjectCheck.cpp index e795f6694a0..f4513856d35 100644 --- a/runtime/gc_base/ObjectCheck.cpp +++ b/runtime/gc_base/ObjectCheck.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ObjectCheck.hpp" diff --git a/runtime/gc_base/ObjectCheck.hpp b/runtime/gc_base/ObjectCheck.hpp index 2607c76d152..7b118e835da 100644 --- a/runtime/gc_base/ObjectCheck.hpp +++ b/runtime/gc_base/ObjectCheck.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTCHECK_HPP_) diff --git a/runtime/gc_base/OwnableSynchronizerObjectBuffer.cpp b/runtime/gc_base/OwnableSynchronizerObjectBuffer.cpp index 0a380aa5e58..1141e7da712 100644 --- a/runtime/gc_base/OwnableSynchronizerObjectBuffer.cpp +++ b/runtime/gc_base/OwnableSynchronizerObjectBuffer.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/OwnableSynchronizerObjectBuffer.hpp b/runtime/gc_base/OwnableSynchronizerObjectBuffer.hpp index cd89600e3ea..f5314bbe33d 100644 --- a/runtime/gc_base/OwnableSynchronizerObjectBuffer.hpp +++ b/runtime/gc_base/OwnableSynchronizerObjectBuffer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OWNABLESYNCHRONIZEROBJECTBUFFER_HPP_ diff --git a/runtime/gc_base/OwnableSynchronizerObjectList.cpp b/runtime/gc_base/OwnableSynchronizerObjectList.cpp index 3d0bc4f5a5d..c2d806fb111 100644 --- a/runtime/gc_base/OwnableSynchronizerObjectList.cpp +++ b/runtime/gc_base/OwnableSynchronizerObjectList.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/OwnableSynchronizerObjectList.hpp b/runtime/gc_base/OwnableSynchronizerObjectList.hpp index b0891739697..ae825b62db5 100644 --- a/runtime/gc_base/OwnableSynchronizerObjectList.hpp +++ b/runtime/gc_base/OwnableSynchronizerObjectList.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OWNABLESYNCHRONIZEROBJECTLIST_HPP_ diff --git a/runtime/gc_base/PacketSlotIterator.cpp b/runtime/gc_base/PacketSlotIterator.cpp index db720a2390d..6662686fa25 100644 --- a/runtime/gc_base/PacketSlotIterator.cpp +++ b/runtime/gc_base/PacketSlotIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/PacketSlotIterator.hpp b/runtime/gc_base/PacketSlotIterator.hpp index 69649e915a9..e40017134f8 100644 --- a/runtime/gc_base/PacketSlotIterator.hpp +++ b/runtime/gc_base/PacketSlotIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/QueryGCStatus.cpp b/runtime/gc_base/QueryGCStatus.cpp index 80d8cbc8343..8cf2ab5d33c 100644 --- a/runtime/gc_base/QueryGCStatus.cpp +++ b/runtime/gc_base/QueryGCStatus.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ReferenceChainWalker.cpp b/runtime/gc_base/ReferenceChainWalker.cpp index 017d14bd3f4..227b2d77d42 100644 --- a/runtime/gc_base/ReferenceChainWalker.cpp +++ b/runtime/gc_base/ReferenceChainWalker.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ReferenceChainWalker.hpp" diff --git a/runtime/gc_base/ReferenceChainWalker.hpp b/runtime/gc_base/ReferenceChainWalker.hpp index d8194c1ba68..e2bbe64a1f8 100644 --- a/runtime/gc_base/ReferenceChainWalker.hpp +++ b/runtime/gc_base/ReferenceChainWalker.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REFERENCECHAINWALKER_HPP_) diff --git a/runtime/gc_base/ReferenceObjectBuffer.cpp b/runtime/gc_base/ReferenceObjectBuffer.cpp index d32101387ce..2a7fc62013f 100644 --- a/runtime/gc_base/ReferenceObjectBuffer.cpp +++ b/runtime/gc_base/ReferenceObjectBuffer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ReferenceObjectBuffer.hpp b/runtime/gc_base/ReferenceObjectBuffer.hpp index f685496ae1b..f82ac877cb3 100644 --- a/runtime/gc_base/ReferenceObjectBuffer.hpp +++ b/runtime/gc_base/ReferenceObjectBuffer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REFERENCEOBJECTBUFFER_HPP_ diff --git a/runtime/gc_base/ReferenceObjectList.cpp b/runtime/gc_base/ReferenceObjectList.cpp index d1c1de0d3fe..8a13c25ce10 100644 --- a/runtime/gc_base/ReferenceObjectList.cpp +++ b/runtime/gc_base/ReferenceObjectList.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/ReferenceObjectList.hpp b/runtime/gc_base/ReferenceObjectList.hpp index 24a34b656b5..22e267112e2 100644 --- a/runtime/gc_base/ReferenceObjectList.hpp +++ b/runtime/gc_base/ReferenceObjectList.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REFERENCEOBJECTLIST_HPP_ diff --git a/runtime/gc_base/RootScanner.cpp b/runtime/gc_base/RootScanner.cpp index 7e2b9c22397..c85ddc43149 100644 --- a/runtime/gc_base/RootScanner.cpp +++ b/runtime/gc_base/RootScanner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/gc_base/RootScanner.hpp b/runtime/gc_base/RootScanner.hpp index 75fdd7ee352..8a6f0cb9f80 100644 --- a/runtime/gc_base/RootScanner.hpp +++ b/runtime/gc_base/RootScanner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/ScavengerForwardedHeader.hpp b/runtime/gc_base/ScavengerForwardedHeader.hpp index 535cf62adb6..4c4b66feab6 100644 --- a/runtime/gc_base/ScavengerForwardedHeader.hpp +++ b/runtime/gc_base/ScavengerForwardedHeader.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SCAVENGERFORWARDEDHEADER_HPP_) diff --git a/runtime/gc_base/StackSlotValidator.cpp b/runtime/gc_base/StackSlotValidator.cpp index 80ffb1ab6e3..f45f40fbc1d 100644 --- a/runtime/gc_base/StackSlotValidator.cpp +++ b/runtime/gc_base/StackSlotValidator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_base/StackSlotValidator.hpp b/runtime/gc_base/StackSlotValidator.hpp index e49fd187a3e..cec4bae845b 100644 --- a/runtime/gc_base/StackSlotValidator.hpp +++ b/runtime/gc_base/StackSlotValidator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/StringTable.cpp b/runtime/gc_base/StringTable.cpp index 69ea31b8593..c3ca306ba6b 100644 --- a/runtime/gc_base/StringTable.cpp +++ b/runtime/gc_base/StringTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "hashtable_api.h" diff --git a/runtime/gc_base/StringTable.hpp b/runtime/gc_base/StringTable.hpp index 912091f42ff..d11c29956c7 100644 --- a/runtime/gc_base/StringTable.hpp +++ b/runtime/gc_base/StringTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/UnfinalizedObjectBuffer.cpp b/runtime/gc_base/UnfinalizedObjectBuffer.cpp index a92be5b7921..9bc4b3ce14d 100644 --- a/runtime/gc_base/UnfinalizedObjectBuffer.cpp +++ b/runtime/gc_base/UnfinalizedObjectBuffer.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/UnfinalizedObjectBuffer.hpp b/runtime/gc_base/UnfinalizedObjectBuffer.hpp index c85c2b454eb..8a5413693a6 100644 --- a/runtime/gc_base/UnfinalizedObjectBuffer.hpp +++ b/runtime/gc_base/UnfinalizedObjectBuffer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNFINALIZEDOBJECTBUFFER_HPP_ diff --git a/runtime/gc_base/UnfinalizedObjectList.cpp b/runtime/gc_base/UnfinalizedObjectList.cpp index b7aa5363952..eede6b18694 100644 --- a/runtime/gc_base/UnfinalizedObjectList.cpp +++ b/runtime/gc_base/UnfinalizedObjectList.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/UnfinalizedObjectList.hpp b/runtime/gc_base/UnfinalizedObjectList.hpp index 8bf05bfd42d..8b0347af0b5 100644 --- a/runtime/gc_base/UnfinalizedObjectList.hpp +++ b/runtime/gc_base/UnfinalizedObjectList.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNFINALIZEDOBJECTLIST_HPP_ diff --git a/runtime/gc_base/VMInterface.cpp b/runtime/gc_base/VMInterface.cpp index de4ccc615ff..1ada0070153 100644 --- a/runtime/gc_base/VMInterface.cpp +++ b/runtime/gc_base/VMInterface.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/VMInterface.hpp b/runtime/gc_base/VMInterface.hpp index 79e33de9a30..b4185dbd61a 100644 --- a/runtime/gc_base/VMInterface.hpp +++ b/runtime/gc_base/VMInterface.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/VMInterfaceAPI.cpp b/runtime/gc_base/VMInterfaceAPI.cpp index 6eb2c4c1cd8..f8c988bf849 100644 --- a/runtime/gc_base/VMInterfaceAPI.cpp +++ b/runtime/gc_base/VMInterfaceAPI.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/VMThreadInterface.cpp b/runtime/gc_base/VMThreadInterface.cpp index 8b5aafa3b63..40936410f14 100644 --- a/runtime/gc_base/VMThreadInterface.cpp +++ b/runtime/gc_base/VMThreadInterface.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/VMThreadInterface.hpp b/runtime/gc_base/VMThreadInterface.hpp index 68cb2450bc4..666f4dd0aef 100644 --- a/runtime/gc_base/VMThreadInterface.hpp +++ b/runtime/gc_base/VMThreadInterface.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/Wildcard.cpp b/runtime/gc_base/Wildcard.cpp index 1c5d12dd712..263b9a9ca1a 100644 --- a/runtime/gc_base/Wildcard.cpp +++ b/runtime/gc_base/Wildcard.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "Wildcard.hpp" diff --git a/runtime/gc_base/Wildcard.hpp b/runtime/gc_base/Wildcard.hpp index a093c93220e..6e676145f09 100644 --- a/runtime/gc_base/Wildcard.hpp +++ b/runtime/gc_base/Wildcard.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_base/WorkPacketsIterator.cpp b/runtime/gc_base/WorkPacketsIterator.cpp index 03e2e6f72c3..71b28c0ab6a 100644 --- a/runtime/gc_base/WorkPacketsIterator.cpp +++ b/runtime/gc_base/WorkPacketsIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/WorkPacketsIterator.hpp b/runtime/gc_base/WorkPacketsIterator.hpp index dbc71aa5889..cbed40a4805 100644 --- a/runtime/gc_base/WorkPacketsIterator.hpp +++ b/runtime/gc_base/WorkPacketsIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/accessBarrier.cpp b/runtime/gc_base/accessBarrier.cpp index 9c2d008fe68..b51463ca7a2 100644 --- a/runtime/gc_base/accessBarrier.cpp +++ b/runtime/gc_base/accessBarrier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/gc_internal.h b/runtime/gc_base/gc_internal.h index ac0ae909a1b..65304209760 100644 --- a/runtime/gc_base/gc_internal.h +++ b/runtime/gc_base/gc_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/modron.h b/runtime/gc_base/modron.h index 15685547799..c513e66ac62 100644 --- a/runtime/gc_base/modron.h +++ b/runtime/gc_base/modron.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/modronapi.cpp b/runtime/gc_base/modronapi.cpp index 26e55cb6835..2d4e9968601 100644 --- a/runtime/gc_base/modronapi.cpp +++ b/runtime/gc_base/modronapi.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_base/modronapi.hpp b/runtime/gc_base/modronapi.hpp index e2aafbac093..66a5aaa4724 100644 --- a/runtime/gc_base/modronapi.hpp +++ b/runtime/gc_base/modronapi.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_base/module.xml b/runtime/gc_base/module.xml index 13ea48452e1..c5799a7337c 100644 --- a/runtime/gc_base/module.xml +++ b/runtime/gc_base/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_check/CMakeLists.txt b/runtime/gc_check/CMakeLists.txt index 6f8bbab7df1..fd2a8027db9 100644 --- a/runtime/gc_check/CMakeLists.txt +++ b/runtime/gc_check/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_check_sources diff --git a/runtime/gc_check/Check.cpp b/runtime/gc_check/Check.cpp index df9cb1ff6e4..704ad0a00d5 100644 --- a/runtime/gc_check/Check.cpp +++ b/runtime/gc_check/Check.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "Check.hpp" diff --git a/runtime/gc_check/Check.hpp b/runtime/gc_check/Check.hpp index 5115d8e2ad1..38c79a36264 100644 --- a/runtime/gc_check/Check.hpp +++ b/runtime/gc_check/Check.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckBase.hpp b/runtime/gc_check/CheckBase.hpp index 46992e8a840..73c4d562ef9 100644 --- a/runtime/gc_check/CheckBase.hpp +++ b/runtime/gc_check/CheckBase.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckClassHeap.cpp b/runtime/gc_check/CheckClassHeap.cpp index 5cab6531f2a..e81174db79c 100644 --- a/runtime/gc_check/CheckClassHeap.cpp +++ b/runtime/gc_check/CheckClassHeap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckClassHeap.hpp b/runtime/gc_check/CheckClassHeap.hpp index 0cbe983c15b..1a8a489c219 100644 --- a/runtime/gc_check/CheckClassHeap.hpp +++ b/runtime/gc_check/CheckClassHeap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckClassLoaders.cpp b/runtime/gc_check/CheckClassLoaders.cpp index 64e7b069ccc..9ba616cc9ec 100644 --- a/runtime/gc_check/CheckClassLoaders.cpp +++ b/runtime/gc_check/CheckClassLoaders.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckClassLoaders.hpp b/runtime/gc_check/CheckClassLoaders.hpp index 99162a415f8..c98aba35d2b 100644 --- a/runtime/gc_check/CheckClassLoaders.hpp +++ b/runtime/gc_check/CheckClassLoaders.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckCycle.cpp b/runtime/gc_check/CheckCycle.cpp index 124918fb466..38aac0c3fd5 100644 --- a/runtime/gc_check/CheckCycle.cpp +++ b/runtime/gc_check/CheckCycle.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/gc_check/CheckCycle.hpp b/runtime/gc_check/CheckCycle.hpp index 71dd21d5455..c03fd47b7bf 100644 --- a/runtime/gc_check/CheckCycle.hpp +++ b/runtime/gc_check/CheckCycle.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckElement.hpp b/runtime/gc_check/CheckElement.hpp index 9337113bac5..cb06e2021dd 100644 --- a/runtime/gc_check/CheckElement.hpp +++ b/runtime/gc_check/CheckElement.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckEngine.cpp b/runtime/gc_check/CheckEngine.cpp index 7fe62bc50c9..58a6963fef8 100644 --- a/runtime/gc_check/CheckEngine.cpp +++ b/runtime/gc_check/CheckEngine.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckEngine.hpp b/runtime/gc_check/CheckEngine.hpp index b8ad9610e89..fc9fa4b5a94 100644 --- a/runtime/gc_check/CheckEngine.hpp +++ b/runtime/gc_check/CheckEngine.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckError.cpp b/runtime/gc_check/CheckError.cpp index 058dcd2d885..bc460a78730 100644 --- a/runtime/gc_check/CheckError.cpp +++ b/runtime/gc_check/CheckError.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckError.hpp b/runtime/gc_check/CheckError.hpp index bb12a21e07e..6b08d108a5b 100644 --- a/runtime/gc_check/CheckError.hpp +++ b/runtime/gc_check/CheckError.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckFinalizableList.cpp b/runtime/gc_check/CheckFinalizableList.cpp index ec6ef9b24ff..686ab371c4a 100644 --- a/runtime/gc_check/CheckFinalizableList.cpp +++ b/runtime/gc_check/CheckFinalizableList.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckFinalizableList.hpp b/runtime/gc_check/CheckFinalizableList.hpp index ca1a472cd91..20d9aa0ec84 100644 --- a/runtime/gc_check/CheckFinalizableList.hpp +++ b/runtime/gc_check/CheckFinalizableList.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckJNIGlobalReferences.cpp b/runtime/gc_check/CheckJNIGlobalReferences.cpp index d5d593a9f0c..c2d968865eb 100644 --- a/runtime/gc_check/CheckJNIGlobalReferences.cpp +++ b/runtime/gc_check/CheckJNIGlobalReferences.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckJNIGlobalReferences.hpp b/runtime/gc_check/CheckJNIGlobalReferences.hpp index 31870234af3..482253878b3 100644 --- a/runtime/gc_check/CheckJNIGlobalReferences.hpp +++ b/runtime/gc_check/CheckJNIGlobalReferences.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckJNIWeakGlobalReferences.cpp b/runtime/gc_check/CheckJNIWeakGlobalReferences.cpp index f09e87d306d..982274be51d 100644 --- a/runtime/gc_check/CheckJNIWeakGlobalReferences.cpp +++ b/runtime/gc_check/CheckJNIWeakGlobalReferences.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckJNIWeakGlobalReferences.hpp b/runtime/gc_check/CheckJNIWeakGlobalReferences.hpp index d12089a4f8a..98ec1c1121c 100644 --- a/runtime/gc_check/CheckJNIWeakGlobalReferences.hpp +++ b/runtime/gc_check/CheckJNIWeakGlobalReferences.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckJVMTIObjectTagTables.cpp b/runtime/gc_check/CheckJVMTIObjectTagTables.cpp index db956bd302f..a5e68ffa84d 100644 --- a/runtime/gc_check/CheckJVMTIObjectTagTables.cpp +++ b/runtime/gc_check/CheckJVMTIObjectTagTables.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_check/CheckJVMTIObjectTagTables.hpp b/runtime/gc_check/CheckJVMTIObjectTagTables.hpp index acfd924b925..bb210209666 100644 --- a/runtime/gc_check/CheckJVMTIObjectTagTables.hpp +++ b/runtime/gc_check/CheckJVMTIObjectTagTables.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckMonitorTable.cpp b/runtime/gc_check/CheckMonitorTable.cpp index 69ed16c59ad..4f02d04adb5 100644 --- a/runtime/gc_check/CheckMonitorTable.cpp +++ b/runtime/gc_check/CheckMonitorTable.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_check/CheckMonitorTable.hpp b/runtime/gc_check/CheckMonitorTable.hpp index 5e02a7c8ef4..cefe96df221 100644 --- a/runtime/gc_check/CheckMonitorTable.hpp +++ b/runtime/gc_check/CheckMonitorTable.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckObjectHeap.cpp b/runtime/gc_check/CheckObjectHeap.cpp index 3aaccb62816..22baaa5dfb9 100644 --- a/runtime/gc_check/CheckObjectHeap.cpp +++ b/runtime/gc_check/CheckObjectHeap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckObjectHeap.hpp b/runtime/gc_check/CheckObjectHeap.hpp index 359d0949be2..6ab638745f2 100644 --- a/runtime/gc_check/CheckObjectHeap.hpp +++ b/runtime/gc_check/CheckObjectHeap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckOwnableSynchronizerList.cpp b/runtime/gc_check/CheckOwnableSynchronizerList.cpp index 7adaa3767a0..c4b332704a3 100644 --- a/runtime/gc_check/CheckOwnableSynchronizerList.cpp +++ b/runtime/gc_check/CheckOwnableSynchronizerList.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckOwnableSynchronizerList.hpp b/runtime/gc_check/CheckOwnableSynchronizerList.hpp index 974d0a3a9c4..ba158247921 100644 --- a/runtime/gc_check/CheckOwnableSynchronizerList.hpp +++ b/runtime/gc_check/CheckOwnableSynchronizerList.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckRememberedSet.cpp b/runtime/gc_check/CheckRememberedSet.cpp index a232ba5b6c0..10ae0216d34 100644 --- a/runtime/gc_check/CheckRememberedSet.cpp +++ b/runtime/gc_check/CheckRememberedSet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckRememberedSet.hpp b/runtime/gc_check/CheckRememberedSet.hpp index 6be9ed437ce..7923268f7e5 100644 --- a/runtime/gc_check/CheckRememberedSet.hpp +++ b/runtime/gc_check/CheckRememberedSet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckReporter.cpp b/runtime/gc_check/CheckReporter.cpp index c328fa62f62..ffd2a5cee61 100644 --- a/runtime/gc_check/CheckReporter.cpp +++ b/runtime/gc_check/CheckReporter.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckReporter.hpp b/runtime/gc_check/CheckReporter.hpp index 09df4719a19..a7c669d2f1a 100644 --- a/runtime/gc_check/CheckReporter.hpp +++ b/runtime/gc_check/CheckReporter.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckReporterTTY.cpp b/runtime/gc_check/CheckReporterTTY.cpp index ea2efd846a8..e3b83190e8d 100644 --- a/runtime/gc_check/CheckReporterTTY.cpp +++ b/runtime/gc_check/CheckReporterTTY.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckReporterTTY.hpp b/runtime/gc_check/CheckReporterTTY.hpp index b2b3428c699..f4ff60ebf86 100644 --- a/runtime/gc_check/CheckReporterTTY.hpp +++ b/runtime/gc_check/CheckReporterTTY.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckStringTable.cpp b/runtime/gc_check/CheckStringTable.cpp index 3e0f322858b..264d46c570d 100644 --- a/runtime/gc_check/CheckStringTable.cpp +++ b/runtime/gc_check/CheckStringTable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckStringTable.hpp b/runtime/gc_check/CheckStringTable.hpp index 5a3558ce0f3..60380a24a62 100644 --- a/runtime/gc_check/CheckStringTable.hpp +++ b/runtime/gc_check/CheckStringTable.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckUnfinalizedList.cpp b/runtime/gc_check/CheckUnfinalizedList.cpp index 61fb16ffd09..ddd96e57a8d 100644 --- a/runtime/gc_check/CheckUnfinalizedList.cpp +++ b/runtime/gc_check/CheckUnfinalizedList.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckUnfinalizedList.hpp b/runtime/gc_check/CheckUnfinalizedList.hpp index f3873fae837..fee02512f28 100644 --- a/runtime/gc_check/CheckUnfinalizedList.hpp +++ b/runtime/gc_check/CheckUnfinalizedList.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckVMClassSlots.cpp b/runtime/gc_check/CheckVMClassSlots.cpp index 63905cb53ae..d743718b51a 100644 --- a/runtime/gc_check/CheckVMClassSlots.cpp +++ b/runtime/gc_check/CheckVMClassSlots.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckVMClassSlots.hpp b/runtime/gc_check/CheckVMClassSlots.hpp index 2c503b2db78..76de3faf35f 100644 --- a/runtime/gc_check/CheckVMClassSlots.hpp +++ b/runtime/gc_check/CheckVMClassSlots.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckVMThreadStacks.cpp b/runtime/gc_check/CheckVMThreadStacks.cpp index 7e47351b8bf..4c5b39a9044 100644 --- a/runtime/gc_check/CheckVMThreadStacks.cpp +++ b/runtime/gc_check/CheckVMThreadStacks.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckVMThreadStacks.hpp b/runtime/gc_check/CheckVMThreadStacks.hpp index b84faa8da5f..cf78ec713ba 100644 --- a/runtime/gc_check/CheckVMThreadStacks.hpp +++ b/runtime/gc_check/CheckVMThreadStacks.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/CheckVMThreads.cpp b/runtime/gc_check/CheckVMThreads.cpp index 4e4a448e8b8..4bac9cb2dd3 100644 --- a/runtime/gc_check/CheckVMThreads.cpp +++ b/runtime/gc_check/CheckVMThreads.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CheckEngine.hpp" diff --git a/runtime/gc_check/CheckVMThreads.hpp b/runtime/gc_check/CheckVMThreads.hpp index 247385a996c..4f2d3eda19c 100644 --- a/runtime/gc_check/CheckVMThreads.hpp +++ b/runtime/gc_check/CheckVMThreads.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/FixDeadObjects.cpp b/runtime/gc_check/FixDeadObjects.cpp index b3fda575a09..c158f0bb125 100644 --- a/runtime/gc_check/FixDeadObjects.cpp +++ b/runtime/gc_check/FixDeadObjects.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_check/FixDeadObjects.hpp b/runtime/gc_check/FixDeadObjects.hpp index c8a46bc0017..f0dc1fa8fea 100644 --- a/runtime/gc_check/FixDeadObjects.hpp +++ b/runtime/gc_check/FixDeadObjects.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/ScanFormatter.cpp b/runtime/gc_check/ScanFormatter.cpp index 35f0a7a543e..72a3fde6526 100644 --- a/runtime/gc_check/ScanFormatter.cpp +++ b/runtime/gc_check/ScanFormatter.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/ScanFormatter.hpp b/runtime/gc_check/ScanFormatter.hpp index 15f2c16aa57..432df36ddbb 100644 --- a/runtime/gc_check/ScanFormatter.hpp +++ b/runtime/gc_check/ScanFormatter.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_check/module.xml b/runtime/gc_check/module.xml index 1530d77ea94..6315bf961d0 100644 --- a/runtime/gc_check/module.xml +++ b/runtime/gc_check/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_ddr/autoblob_gc.mk b/runtime/gc_ddr/autoblob_gc.mk index b5dda26dc35..7dc45453878 100644 --- a/runtime/gc_ddr/autoblob_gc.mk +++ b/runtime/gc_ddr/autoblob_gc.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### DISABLE_STUBS := 1 diff --git a/runtime/gc_ddr/ddr_gcheaders.mk b/runtime/gc_ddr/ddr_gcheaders.mk index 0bbaf1e9d44..5d4c21a93bc 100644 --- a/runtime/gc_ddr/ddr_gcheaders.mk +++ b/runtime/gc_ddr/ddr_gcheaders.mk @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Targets to generate DDR blob C code from C headers automatically. diff --git a/runtime/gc_ddr/gc_xlat.sed b/runtime/gc_ddr/gc_xlat.sed index 24b3501b8bf..9f876ad0910 100644 --- a/runtime/gc_ddr/gc_xlat.sed +++ b/runtime/gc_ddr/gc_xlat.sed @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # remove CRs, add a comment, and add friends to each class diff --git a/runtime/gc_ddr/gcddrblob.cpp.stub b/runtime/gc_ddr/gcddrblob.cpp.stub index fb6e0930e55..9bffb543a24 100644 --- a/runtime/gc_ddr/gcddrblob.cpp.stub +++ b/runtime/gc_ddr/gcddrblob.cpp.stub @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_ddr/gcddrstructs.properties b/runtime/gc_ddr/gcddrstructs.properties index 056fed8dff7..9b1a2a5eba9 100644 --- a/runtime/gc_ddr/gcddrstructs.properties +++ b/runtime/gc_ddr/gcddrstructs.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### #Configuration for J9DDR blob generator. diff --git a/runtime/gc_ddr/module.xml b/runtime/gc_ddr/module.xml index c7001258dd3..abced1405fa 100644 --- a/runtime/gc_ddr/module.xml +++ b/runtime/gc_ddr/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_doc/DoxygenConfig.txt b/runtime/gc_doc/DoxygenConfig.txt index d0bfd945a36..050dce65316 100644 --- a/runtime/gc_doc/DoxygenConfig.txt +++ b/runtime/gc_doc/DoxygenConfig.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Doxyfile 1.8.3.1 diff --git a/runtime/gc_doc/DoxygenSupport.txt b/runtime/gc_doc/DoxygenSupport.txt index f8c39b7c940..9cd33767ee8 100644 --- a/runtime/gc_doc/DoxygenSupport.txt +++ b/runtime/gc_doc/DoxygenSupport.txt @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/gc_doc/makefile b/runtime/gc_doc/makefile index 2f074849888..a4e977a5757 100644 --- a/runtime/gc_doc/makefile +++ b/runtime/gc_doc/makefile @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # # Note: This is a Windows makefile. These tools are intended to be run diff --git a/runtime/gc_glue_java/ArrayletObjectModel.cpp b/runtime/gc_glue_java/ArrayletObjectModel.cpp index a2643f42415..538691c2a83 100644 --- a/runtime/gc_glue_java/ArrayletObjectModel.cpp +++ b/runtime/gc_glue_java/ArrayletObjectModel.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ArrayletLeafIterator.hpp" diff --git a/runtime/gc_glue_java/ArrayletObjectModel.hpp b/runtime/gc_glue_java/ArrayletObjectModel.hpp index 1cc680ad637..27a16bf0920 100644 --- a/runtime/gc_glue_java/ArrayletObjectModel.hpp +++ b/runtime/gc_glue_java/ArrayletObjectModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_glue_java/ArrayletObjectModelBase.cpp b/runtime/gc_glue_java/ArrayletObjectModelBase.cpp index 17d4595e8c2..9d523683a11 100644 --- a/runtime/gc_glue_java/ArrayletObjectModelBase.cpp +++ b/runtime/gc_glue_java/ArrayletObjectModelBase.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ArrayletObjectModelBase.hpp" diff --git a/runtime/gc_glue_java/ArrayletObjectModelBase.hpp b/runtime/gc_glue_java/ArrayletObjectModelBase.hpp index a29f4ea4d09..c4e82827f00 100644 --- a/runtime/gc_glue_java/ArrayletObjectModelBase.hpp +++ b/runtime/gc_glue_java/ArrayletObjectModelBase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ARRAYLETOBJECTMODELBASE_) diff --git a/runtime/gc_glue_java/CMakeLists.txt b/runtime/gc_glue_java/CMakeLists.txt index 4e9df1b160c..f791e29f1fb 100644 --- a/runtime/gc_glue_java/CMakeLists.txt +++ b/runtime/gc_glue_java/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(j9vm_gc_glue_sources diff --git a/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.cpp b/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.cpp index c0a3dbda4a3..ec946c37593 100644 --- a/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.cpp +++ b/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CollectorLanguageInterfaceImpl.hpp" diff --git a/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.hpp b/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.hpp index a41ad53b301..eea2889f4ce 100644 --- a/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.hpp +++ b/runtime/gc_glue_java/CollectorLanguageInterfaceImpl.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COLLECTORLANGUAGEINTERFACEJAVA_HPP_ diff --git a/runtime/gc_glue_java/CompactDelegate.cpp b/runtime/gc_glue_java/CompactDelegate.cpp index dab5e0fe93c..2a5e998ea07 100644 --- a/runtime/gc_glue_java/CompactDelegate.cpp +++ b/runtime/gc_glue_java/CompactDelegate.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CompactDelegate.hpp" diff --git a/runtime/gc_glue_java/CompactDelegate.hpp b/runtime/gc_glue_java/CompactDelegate.hpp index 970e39392ce..73bce763852 100644 --- a/runtime/gc_glue_java/CompactDelegate.hpp +++ b/runtime/gc_glue_java/CompactDelegate.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPACTDELEGATE_HPP_ diff --git a/runtime/gc_glue_java/CompactSchemeCheckMarkRoots.hpp b/runtime/gc_glue_java/CompactSchemeCheckMarkRoots.hpp index d311710d428..cfd7bd26e36 100644 --- a/runtime/gc_glue_java/CompactSchemeCheckMarkRoots.hpp +++ b/runtime/gc_glue_java/CompactSchemeCheckMarkRoots.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CHECKMARKROOTS_HPP_ diff --git a/runtime/gc_glue_java/CompactSchemeFixupObject.cpp b/runtime/gc_glue_java/CompactSchemeFixupObject.cpp index 3e81d42e82c..613c35c1e4c 100644 --- a/runtime/gc_glue_java/CompactSchemeFixupObject.cpp +++ b/runtime/gc_glue_java/CompactSchemeFixupObject.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/CompactSchemeFixupObject.hpp b/runtime/gc_glue_java/CompactSchemeFixupObject.hpp index 2be0ebca270..dec8925967b 100644 --- a/runtime/gc_glue_java/CompactSchemeFixupObject.hpp +++ b/runtime/gc_glue_java/CompactSchemeFixupObject.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef COMPACTSCHEMEOBJECTFIXUP_HPP_ diff --git a/runtime/gc_glue_java/CompactSchemeFixupRoots.cpp b/runtime/gc_glue_java/CompactSchemeFixupRoots.cpp index e3ae2561e63..50148a7f1b0 100644 --- a/runtime/gc_glue_java/CompactSchemeFixupRoots.cpp +++ b/runtime/gc_glue_java/CompactSchemeFixupRoots.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CompactSchemeFixupRoots.hpp" diff --git a/runtime/gc_glue_java/CompactSchemeFixupRoots.hpp b/runtime/gc_glue_java/CompactSchemeFixupRoots.hpp index 661c95074fa..3b7490ebb6c 100644 --- a/runtime/gc_glue_java/CompactSchemeFixupRoots.hpp +++ b/runtime/gc_glue_java/CompactSchemeFixupRoots.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FIXUPROOTS_HPP_ diff --git a/runtime/gc_glue_java/ConcurrentMarkingDelegate.cpp b/runtime/gc_glue_java/ConcurrentMarkingDelegate.cpp index 1a4fa9d0d26..bc57b5710dd 100644 --- a/runtime/gc_glue_java/ConcurrentMarkingDelegate.cpp +++ b/runtime/gc_glue_java/ConcurrentMarkingDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ConcurrentMarkingDelegate.hpp" diff --git a/runtime/gc_glue_java/ConcurrentMarkingDelegate.hpp b/runtime/gc_glue_java/ConcurrentMarkingDelegate.hpp index 892d4916ddc..436e14849d8 100644 --- a/runtime/gc_glue_java/ConcurrentMarkingDelegate.hpp +++ b/runtime/gc_glue_java/ConcurrentMarkingDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CONCURRENTMARKINGDELEGATE_HPP_) diff --git a/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.cpp b/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.cpp index 440e9e275ff..6669a71d112 100644 --- a/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.cpp +++ b/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ConcurrentSafepointCallbackJava.hpp" diff --git a/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.hpp b/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.hpp index e4a6710c81b..68976d91366 100644 --- a/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.hpp +++ b/runtime/gc_glue_java/ConcurrentSafepointCallbackJava.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CONCURRENTSAFEPOINTCALLBACKJAVA_HPP_) diff --git a/runtime/gc_glue_java/ConfigurationDelegate.hpp b/runtime/gc_glue_java/ConfigurationDelegate.hpp index 3d9f3c5ecf9..b974bda2314 100644 --- a/runtime/gc_glue_java/ConfigurationDelegate.hpp +++ b/runtime/gc_glue_java/ConfigurationDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONFIGURATIONDELEGATE_HPP_ diff --git a/runtime/gc_glue_java/ContractslotScanner.hpp b/runtime/gc_glue_java/ContractslotScanner.hpp index 99f50217200..495a39dbe51 100644 --- a/runtime/gc_glue_java/ContractslotScanner.hpp +++ b/runtime/gc_glue_java/ContractslotScanner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "Base.hpp" diff --git a/runtime/gc_glue_java/EnvironmentDelegate.cpp b/runtime/gc_glue_java/EnvironmentDelegate.cpp index 728adb13164..4327af0e14d 100644 --- a/runtime/gc_glue_java/EnvironmentDelegate.cpp +++ b/runtime/gc_glue_java/EnvironmentDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" #include "ModronAssertions.h" diff --git a/runtime/gc_glue_java/EnvironmentDelegate.hpp b/runtime/gc_glue_java/EnvironmentDelegate.hpp index 12960634ce0..e78efbb4d35 100644 --- a/runtime/gc_glue_java/EnvironmentDelegate.hpp +++ b/runtime/gc_glue_java/EnvironmentDelegate.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ENVIRONMENTDELEGATE_HPP_ diff --git a/runtime/gc_glue_java/FlattenedArrayObjectScanner.hpp b/runtime/gc_glue_java/FlattenedArrayObjectScanner.hpp index 600da82b629..5e5d5cb1377 100644 --- a/runtime/gc_glue_java/FlattenedArrayObjectScanner.hpp +++ b/runtime/gc_glue_java/FlattenedArrayObjectScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(FLATTENEDARRAYOBJECTSCANNER_HPP_) diff --git a/runtime/gc_glue_java/GlobalCollectorDelegate.cpp b/runtime/gc_glue_java/GlobalCollectorDelegate.cpp index 29fb29b040e..d3214f75d92 100644 --- a/runtime/gc_glue_java/GlobalCollectorDelegate.cpp +++ b/runtime/gc_glue_java/GlobalCollectorDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/GlobalCollectorDelegate.hpp b/runtime/gc_glue_java/GlobalCollectorDelegate.hpp index 07c62fe594f..9f95f29eac5 100644 --- a/runtime/gc_glue_java/GlobalCollectorDelegate.hpp +++ b/runtime/gc_glue_java/GlobalCollectorDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef GLOBALCOLLECTORDELEGATE_HPP_ diff --git a/runtime/gc_glue_java/HeadlessMixedObjectScanner.hpp b/runtime/gc_glue_java/HeadlessMixedObjectScanner.hpp index 431ed445e6d..2d3433db9ff 100644 --- a/runtime/gc_glue_java/HeadlessMixedObjectScanner.hpp +++ b/runtime/gc_glue_java/HeadlessMixedObjectScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEADLESSMIXEDOBJECTSCANNER_HPP_) diff --git a/runtime/gc_glue_java/HeapWalkerDelegate.cpp b/runtime/gc_glue_java/HeapWalkerDelegate.cpp index 492be4d4426..1f9dab4d6ba 100644 --- a/runtime/gc_glue_java/HeapWalkerDelegate.cpp +++ b/runtime/gc_glue_java/HeapWalkerDelegate.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "HeapWalkerDelegate.hpp" diff --git a/runtime/gc_glue_java/HeapWalkerDelegate.hpp b/runtime/gc_glue_java/HeapWalkerDelegate.hpp index 61a942c401c..e092e210b7f 100644 --- a/runtime/gc_glue_java/HeapWalkerDelegate.hpp +++ b/runtime/gc_glue_java/HeapWalkerDelegate.hpp @@ -16,7 +16,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPWALKERDELEGATE_HPP_) diff --git a/runtime/gc_glue_java/JNICriticalRegion.cpp b/runtime/gc_glue_java/JNICriticalRegion.cpp index 711bb843525..53e5489a125 100644 --- a/runtime/gc_glue_java/JNICriticalRegion.cpp +++ b/runtime/gc_glue_java/JNICriticalRegion.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/JNICriticalRegion.hpp b/runtime/gc_glue_java/JNICriticalRegion.hpp index dd0e57c20a1..302009170f3 100644 --- a/runtime/gc_glue_java/JNICriticalRegion.hpp +++ b/runtime/gc_glue_java/JNICriticalRegion.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_glue_java/LanguageSegregatedAllocationCache.hpp b/runtime/gc_glue_java/LanguageSegregatedAllocationCache.hpp index d219097df24..07873c04478 100644 --- a/runtime/gc_glue_java/LanguageSegregatedAllocationCache.hpp +++ b/runtime/gc_glue_java/LanguageSegregatedAllocationCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LANGUAGESEGREGATEDALLOCATIONCACHE_HPP_ diff --git a/runtime/gc_glue_java/LanguageThreadLocalHeap.hpp b/runtime/gc_glue_java/LanguageThreadLocalHeap.hpp index 1188131c92b..2656d85f56e 100644 --- a/runtime/gc_glue_java/LanguageThreadLocalHeap.hpp +++ b/runtime/gc_glue_java/LanguageThreadLocalHeap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LANGUAGETHREADLOCALHEAP_HPP_ diff --git a/runtime/gc_glue_java/LanguageVMGlue.c b/runtime/gc_glue_java/LanguageVMGlue.c index b03c127313c..75b65dbe306 100644 --- a/runtime/gc_glue_java/LanguageVMGlue.c +++ b/runtime/gc_glue_java/LanguageVMGlue.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/MarkingDelegate.cpp b/runtime/gc_glue_java/MarkingDelegate.cpp index c2cfe282936..29b078e0a1a 100644 --- a/runtime/gc_glue_java/MarkingDelegate.cpp +++ b/runtime/gc_glue_java/MarkingDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/MarkingDelegate.hpp b/runtime/gc_glue_java/MarkingDelegate.hpp index 7664a2fdf6f..02c4f25f071 100644 --- a/runtime/gc_glue_java/MarkingDelegate.hpp +++ b/runtime/gc_glue_java/MarkingDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MARKINGDELEGATE_HPP_) diff --git a/runtime/gc_glue_java/MarkingSchemeRootClearer.cpp b/runtime/gc_glue_java/MarkingSchemeRootClearer.cpp index 4a09f04b03b..92894085781 100644 --- a/runtime/gc_glue_java/MarkingSchemeRootClearer.cpp +++ b/runtime/gc_glue_java/MarkingSchemeRootClearer.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/MarkingSchemeRootClearer.hpp b/runtime/gc_glue_java/MarkingSchemeRootClearer.hpp index 890778f98f4..19b0e18d6ac 100644 --- a/runtime/gc_glue_java/MarkingSchemeRootClearer.hpp +++ b/runtime/gc_glue_java/MarkingSchemeRootClearer.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MARKINGSCHEMEROOTCLEARER_HPP_) diff --git a/runtime/gc_glue_java/MarkingSchemeRootMarker.cpp b/runtime/gc_glue_java/MarkingSchemeRootMarker.cpp index a6d8d64d5cd..d807f5d85a9 100644 --- a/runtime/gc_glue_java/MarkingSchemeRootMarker.cpp +++ b/runtime/gc_glue_java/MarkingSchemeRootMarker.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_glue_java/MarkingSchemeRootMarker.hpp b/runtime/gc_glue_java/MarkingSchemeRootMarker.hpp index e9c55cf3de2..366d853c035 100644 --- a/runtime/gc_glue_java/MarkingSchemeRootMarker.hpp +++ b/runtime/gc_glue_java/MarkingSchemeRootMarker.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MARKINGSCHEMEROOTMARKER_HPP_) diff --git a/runtime/gc_glue_java/MetronomeDelegate.cpp b/runtime/gc_glue_java/MetronomeDelegate.cpp index 09fa3f29f7d..3b4f1cfbdd1 100644 --- a/runtime/gc_glue_java/MetronomeDelegate.cpp +++ b/runtime/gc_glue_java/MetronomeDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "MetronomeDelegate.hpp" diff --git a/runtime/gc_glue_java/MetronomeDelegate.hpp b/runtime/gc_glue_java/MetronomeDelegate.hpp index 4da363e0c97..7fe5df03453 100644 --- a/runtime/gc_glue_java/MetronomeDelegate.hpp +++ b/runtime/gc_glue_java/MetronomeDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(METRONOMEDELEGATE_HPP_) diff --git a/runtime/gc_glue_java/MixedObjectModel.cpp b/runtime/gc_glue_java/MixedObjectModel.cpp index 0574bb1f035..ab19c1e6d5b 100644 --- a/runtime/gc_glue_java/MixedObjectModel.cpp +++ b/runtime/gc_glue_java/MixedObjectModel.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_glue_java/MixedObjectModel.hpp b/runtime/gc_glue_java/MixedObjectModel.hpp index c0c7e148dfc..b8380ec30b0 100644 --- a/runtime/gc_glue_java/MixedObjectModel.hpp +++ b/runtime/gc_glue_java/MixedObjectModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MIXEDOBJECTMODEL_HPP_) diff --git a/runtime/gc_glue_java/MixedObjectScanner.hpp b/runtime/gc_glue_java/MixedObjectScanner.hpp index 4a6327314bb..33eae03978a 100644 --- a/runtime/gc_glue_java/MixedObjectScanner.hpp +++ b/runtime/gc_glue_java/MixedObjectScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_glue_java/ObjectIterator.hpp b/runtime/gc_glue_java/ObjectIterator.hpp index 171e15f53d6..4858dd8a435 100644 --- a/runtime/gc_glue_java/ObjectIterator.hpp +++ b/runtime/gc_glue_java/ObjectIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTITERATOR_HPP_) diff --git a/runtime/gc_glue_java/ObjectModel.cpp b/runtime/gc_glue_java/ObjectModel.cpp index ba4dcbc8286..3e95918b98d 100644 --- a/runtime/gc_glue_java/ObjectModel.cpp +++ b/runtime/gc_glue_java/ObjectModel.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/gc_glue_java/ObjectModel.hpp b/runtime/gc_glue_java/ObjectModel.hpp index cce238e3028..ed0836220c3 100644 --- a/runtime/gc_glue_java/ObjectModel.hpp +++ b/runtime/gc_glue_java/ObjectModel.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_glue_java/ObjectModelDelegate.cpp b/runtime/gc_glue_java/ObjectModelDelegate.cpp index 2b9d105956f..119d0d4b8b4 100644 --- a/runtime/gc_glue_java/ObjectModelDelegate.cpp +++ b/runtime/gc_glue_java/ObjectModelDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AllocateInitialization.hpp" diff --git a/runtime/gc_glue_java/ObjectModelDelegate.hpp b/runtime/gc_glue_java/ObjectModelDelegate.hpp index 375e9c78bef..3dda63405a9 100644 --- a/runtime/gc_glue_java/ObjectModelDelegate.hpp +++ b/runtime/gc_glue_java/ObjectModelDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OBJECTMODELDELEGATE_HPP_ diff --git a/runtime/gc_glue_java/ObjectScannerState.hpp b/runtime/gc_glue_java/ObjectScannerState.hpp index 0b81bf72fda..71f46f5d19e 100644 --- a/runtime/gc_glue_java/ObjectScannerState.hpp +++ b/runtime/gc_glue_java/ObjectScannerState.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_glue_java/PointerArrayObjectScanner.hpp b/runtime/gc_glue_java/PointerArrayObjectScanner.hpp index bba88909f28..6a92110605c 100644 --- a/runtime/gc_glue_java/PointerArrayObjectScanner.hpp +++ b/runtime/gc_glue_java/PointerArrayObjectScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(POINTERARRAYOBJECTSCANNER_HPP_) diff --git a/runtime/gc_glue_java/ReferenceObjectScanner.hpp b/runtime/gc_glue_java/ReferenceObjectScanner.hpp index 77e4c74b44c..990fde116fa 100644 --- a/runtime/gc_glue_java/ReferenceObjectScanner.hpp +++ b/runtime/gc_glue_java/ReferenceObjectScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_glue_java/ScavengerBackOutScanner.cpp b/runtime/gc_glue_java/ScavengerBackOutScanner.cpp index eb136cdb7f4..8cdcccf2b30 100644 --- a/runtime/gc_glue_java/ScavengerBackOutScanner.cpp +++ b/runtime/gc_glue_java/ScavengerBackOutScanner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_glue_java/ScavengerBackOutScanner.hpp b/runtime/gc_glue_java/ScavengerBackOutScanner.hpp index 648ab747afd..0086e4ac40a 100644 --- a/runtime/gc_glue_java/ScavengerBackOutScanner.hpp +++ b/runtime/gc_glue_java/ScavengerBackOutScanner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERBACKOUTSCANNER_HPP_ diff --git a/runtime/gc_glue_java/ScavengerDelegate.cpp b/runtime/gc_glue_java/ScavengerDelegate.cpp index 9b211c129a2..c3b854a3a2d 100644 --- a/runtime/gc_glue_java/ScavengerDelegate.cpp +++ b/runtime/gc_glue_java/ScavengerDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcfg.h" diff --git a/runtime/gc_glue_java/ScavengerDelegate.hpp b/runtime/gc_glue_java/ScavengerDelegate.hpp index a6fd081063e..c08d9fd9459 100644 --- a/runtime/gc_glue_java/ScavengerDelegate.hpp +++ b/runtime/gc_glue_java/ScavengerDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SCAVENGERDELEGATEJAVA_HPP_) diff --git a/runtime/gc_glue_java/ScavengerRootClearer.cpp b/runtime/gc_glue_java/ScavengerRootClearer.cpp index 6f4fddc7302..26ed7ff335a 100644 --- a/runtime/gc_glue_java/ScavengerRootClearer.cpp +++ b/runtime/gc_glue_java/ScavengerRootClearer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_glue_java/ScavengerRootClearer.hpp b/runtime/gc_glue_java/ScavengerRootClearer.hpp index 614b2309103..d150374cc14 100644 --- a/runtime/gc_glue_java/ScavengerRootClearer.hpp +++ b/runtime/gc_glue_java/ScavengerRootClearer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERROOTCLEARER_HPP_ diff --git a/runtime/gc_glue_java/ScavengerRootScanner.cpp b/runtime/gc_glue_java/ScavengerRootScanner.cpp index ecdc0463ee6..b112c7e2a5e 100644 --- a/runtime/gc_glue_java/ScavengerRootScanner.cpp +++ b/runtime/gc_glue_java/ScavengerRootScanner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_glue_java/ScavengerRootScanner.hpp b/runtime/gc_glue_java/ScavengerRootScanner.hpp index 8a6fac5cbdb..8035184b13a 100644 --- a/runtime/gc_glue_java/ScavengerRootScanner.hpp +++ b/runtime/gc_glue_java/ScavengerRootScanner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERROOTSCANNER_HPP_ diff --git a/runtime/gc_glue_java/ScavengerThreadRescanner.hpp b/runtime/gc_glue_java/ScavengerThreadRescanner.hpp index c3949034757..51678d19fc7 100644 --- a/runtime/gc_glue_java/ScavengerThreadRescanner.hpp +++ b/runtime/gc_glue_java/ScavengerThreadRescanner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SCAVENGERTHREADRESCANNER_HPP_ diff --git a/runtime/gc_glue_java/StartupManagerImpl.hpp b/runtime/gc_glue_java/StartupManagerImpl.hpp index f5d115df6b2..210894ce72b 100644 --- a/runtime/gc_glue_java/StartupManagerImpl.hpp +++ b/runtime/gc_glue_java/StartupManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MM_STARTUPMANAGERIMPL_HPP_) diff --git a/runtime/gc_glue_java/UtilGlue.c b/runtime/gc_glue_java/UtilGlue.c index d0c4dffd168..a1fa4167c11 100644 --- a/runtime/gc_glue_java/UtilGlue.c +++ b/runtime/gc_glue_java/UtilGlue.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk b/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk index 91ab60a9026..b923fc6f218 100644 --- a/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk +++ b/runtime/gc_glue_java/configure_includes/configure_aix_ppc.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl b/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl index a85c0f3c35c..877b06a684d 100644 --- a/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl +++ b/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # Detect 64-bit vs. 32-bit. diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_390.mk b/runtime/gc_glue_java/configure_includes/configure_linux_390.mk index 2d6b4f8460a..cacfe8ae149 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_390.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_390.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk b/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk index 71eab45dad8..abec3b9099f 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk b/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk index ef4a4d72791..fd009c2c365 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_arm.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk b/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk index 5fdebc6db5b..c6f39191b76 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_ppc.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_riscv.mk b/runtime/gc_glue_java/configure_includes/configure_linux_riscv.mk index 46a2803153b..eb8cc5efe41 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_riscv.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_riscv.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk b/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk index f7e067f8e8a..284a504c917 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_x86.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_linux_ztpf_390.mk b/runtime/gc_glue_java/configure_includes/configure_linux_ztpf_390.mk index a0579f4518b..4a2f184b203 100644 --- a/runtime/gc_glue_java/configure_includes/configure_linux_ztpf_390.mk +++ b/runtime/gc_glue_java/configure_includes/configure_linux_ztpf_390.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_osx.mk b/runtime/gc_glue_java/configure_includes/configure_osx.mk index f75e3cbb35a..009d8f101e7 100644 --- a/runtime/gc_glue_java/configure_includes/configure_osx.mk +++ b/runtime/gc_glue_java/configure_includes/configure_osx.mk @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_win_x86.mk b/runtime/gc_glue_java/configure_includes/configure_win_x86.mk index cfd34b436f9..59d9effb022 100644 --- a/runtime/gc_glue_java/configure_includes/configure_win_x86.mk +++ b/runtime/gc_glue_java/configure_includes/configure_win_x86.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/configure_includes/configure_zos_390.mk.ftl b/runtime/gc_glue_java/configure_includes/configure_zos_390.mk.ftl index 33c26973ea6..dc29952bde5 100644 --- a/runtime/gc_glue_java/configure_includes/configure_zos_390.mk.ftl +++ b/runtime/gc_glue_java/configure_includes/configure_zos_390.mk.ftl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### include $(CONFIG_INCL_DIR)/configure_common.mk diff --git a/runtime/gc_glue_java/module.xml b/runtime/gc_glue_java/module.xml index 9cc21da72a9..107e6b8cacf 100644 --- a/runtime/gc_glue_java/module.xml +++ b/runtime/gc_glue_java/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_glue_java/objectdescription.h b/runtime/gc_glue_java/objectdescription.h index fd9cbb4a6a4..7b8691ac8c1 100644 --- a/runtime/gc_glue_java/objectdescription.h +++ b/runtime/gc_glue_java/objectdescription.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTDESCRIPTION_H_) diff --git a/runtime/gc_glue_java/sizeclasses.h b/runtime/gc_glue_java/sizeclasses.h index 3ce804ef603..ad5d8e04758 100644 --- a/runtime/gc_glue_java/sizeclasses.h +++ b/runtime/gc_glue_java/sizeclasses.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_include/HeapIteratorAPI.h b/runtime/gc_include/HeapIteratorAPI.h index b30d5104f60..e478757602f 100644 --- a/runtime/gc_include/HeapIteratorAPI.h +++ b/runtime/gc_include/HeapIteratorAPI.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_include/ObjectAccessBarrierAPI.hpp b/runtime/gc_include/ObjectAccessBarrierAPI.hpp index f00497abe97..fb380aeae28 100644 --- a/runtime/gc_include/ObjectAccessBarrierAPI.hpp +++ b/runtime/gc_include/ObjectAccessBarrierAPI.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTACCESSBARRIERAPI_HPP_) diff --git a/runtime/gc_include/ObjectAllocationAPI.hpp b/runtime/gc_include/ObjectAllocationAPI.hpp index 3796b3738d3..fe5a9062abd 100644 --- a/runtime/gc_include/ObjectAllocationAPI.hpp +++ b/runtime/gc_include/ObjectAllocationAPI.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTALLOCATIONAPI_HPP_) diff --git a/runtime/gc_include/ResourceManagedSupport.h b/runtime/gc_include/ResourceManagedSupport.h index fc642321bc2..26fafbbfc46 100644 --- a/runtime/gc_include/ResourceManagedSupport.h +++ b/runtime/gc_include/ResourceManagedSupport.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_include/VerboseGCInterface.h b/runtime/gc_include/VerboseGCInterface.h index d713b9924a2..6c25f64b43e 100644 --- a/runtime/gc_include/VerboseGCInterface.h +++ b/runtime/gc_include/VerboseGCInterface.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VGC_INTERFACE_HPP_) diff --git a/runtime/gc_include/arrayCopyInterface.h b/runtime/gc_include/arrayCopyInterface.h index 31cbcb53e12..23e630f8f02 100644 --- a/runtime/gc_include/arrayCopyInterface.h +++ b/runtime/gc_include/arrayCopyInterface.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ARRAY_COPY_INTERFACE_H_) diff --git a/runtime/gc_include/j9mm.hdf b/runtime/gc_include/j9mm.hdf index 7e59a84cc53..a04f2ac995f 100644 --- a/runtime/gc_include/j9mm.hdf +++ b/runtime/gc_include/j9mm.hdf @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../include/mmhook.h diff --git a/runtime/gc_include/j9modron.h b/runtime/gc_include/j9modron.h index 35a66c8e716..59884c72f9d 100644 --- a/runtime/gc_include/j9modron.h +++ b/runtime/gc_include/j9modron.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9MODRON_H__) diff --git a/runtime/gc_include/module.xml b/runtime/gc_include/module.xml index 8b5617179e4..7dcf82bafa9 100644 --- a/runtime/gc_include/module.xml +++ b/runtime/gc_include/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_modron_standard/CMakeLists.txt b/runtime/gc_modron_standard/CMakeLists.txt index c219dcd61c6..44e4c2d5d0b 100644 --- a/runtime/gc_modron_standard/CMakeLists.txt +++ b/runtime/gc_modron_standard/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_modron_standard_sources diff --git a/runtime/gc_modron_standard/ConcurrentSweepGC.cpp b/runtime/gc_modron_standard/ConcurrentSweepGC.cpp index 049fb48dab4..b94e6cee2a7 100644 --- a/runtime/gc_modron_standard/ConcurrentSweepGC.cpp +++ b/runtime/gc_modron_standard/ConcurrentSweepGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_modron_standard/ConcurrentSweepGC.hpp b/runtime/gc_modron_standard/ConcurrentSweepGC.hpp index faadc9a6cb4..ca4ee71afea 100644 --- a/runtime/gc_modron_standard/ConcurrentSweepGC.hpp +++ b/runtime/gc_modron_standard/ConcurrentSweepGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CONCURRENTSWEEPGC_HPP_) diff --git a/runtime/gc_modron_standard/ContinuationObjectBufferStandard.cpp b/runtime/gc_modron_standard/ContinuationObjectBufferStandard.cpp index 58611610944..2e9a1ddb70b 100644 --- a/runtime/gc_modron_standard/ContinuationObjectBufferStandard.cpp +++ b/runtime/gc_modron_standard/ContinuationObjectBufferStandard.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_modron_standard/ContinuationObjectBufferStandard.hpp b/runtime/gc_modron_standard/ContinuationObjectBufferStandard.hpp index 6f0c0e54e2d..abef21c853a 100644 --- a/runtime/gc_modron_standard/ContinuationObjectBufferStandard.hpp +++ b/runtime/gc_modron_standard/ContinuationObjectBufferStandard.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONTINUATIONOBJECTBUFFERSTANDARD_HPP_ diff --git a/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.cpp b/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.cpp index 93db1781921..1f6579f4f89 100644 --- a/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.cpp +++ b/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.hpp b/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.hpp index e7a28bf0758..6d832010c27 100644 --- a/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.hpp +++ b/runtime/gc_modron_standard/OwnableSynchronizerObjectBufferStandard.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OWNABLESYNCHRONIZEROBJECTBUFFERSTANDARD_HPP_ diff --git a/runtime/gc_modron_standard/ReadBarrierVerifier.cpp b/runtime/gc_modron_standard/ReadBarrierVerifier.cpp index ccd3e620a9d..1af78cc0561 100644 --- a/runtime/gc_modron_standard/ReadBarrierVerifier.cpp +++ b/runtime/gc_modron_standard/ReadBarrierVerifier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_standard/ReadBarrierVerifier.hpp b/runtime/gc_modron_standard/ReadBarrierVerifier.hpp index 1574bb862fb..c34cbeda97e 100644 --- a/runtime/gc_modron_standard/ReadBarrierVerifier.hpp +++ b/runtime/gc_modron_standard/ReadBarrierVerifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_standard/ReferenceObjectBufferStandard.cpp b/runtime/gc_modron_standard/ReferenceObjectBufferStandard.cpp index cfdc35ee2b1..12c036b0f68 100644 --- a/runtime/gc_modron_standard/ReferenceObjectBufferStandard.cpp +++ b/runtime/gc_modron_standard/ReferenceObjectBufferStandard.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_modron_standard/ReferenceObjectBufferStandard.hpp b/runtime/gc_modron_standard/ReferenceObjectBufferStandard.hpp index e56bde86345..88b8c18ca99 100644 --- a/runtime/gc_modron_standard/ReferenceObjectBufferStandard.hpp +++ b/runtime/gc_modron_standard/ReferenceObjectBufferStandard.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REFERENCEOBJECTBUFFERSTANDARD_HPP_ diff --git a/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.cpp b/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.cpp index 225292e570d..a16f3275524 100644 --- a/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.cpp +++ b/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ReadBarrierVerifier.hpp" diff --git a/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.hpp b/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.hpp index 14964880bb9..3c1658cdb8d 100644 --- a/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.hpp +++ b/runtime/gc_modron_standard/RootScannerReadBarrierVerifier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_standard/StandardAccessBarrier.cpp b/runtime/gc_modron_standard/StandardAccessBarrier.cpp index 20460e79b6c..090072c5469 100644 --- a/runtime/gc_modron_standard/StandardAccessBarrier.cpp +++ b/runtime/gc_modron_standard/StandardAccessBarrier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_standard/StandardAccessBarrier.hpp b/runtime/gc_modron_standard/StandardAccessBarrier.hpp index 42c19065703..9cabf9bb98f 100644 --- a/runtime/gc_modron_standard/StandardAccessBarrier.hpp +++ b/runtime/gc_modron_standard/StandardAccessBarrier.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.cpp b/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.cpp index 09dcfa3f525..2daf057da07 100644 --- a/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.cpp +++ b/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.hpp b/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.hpp index 1741f195fbc..55d35e4b381 100644 --- a/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.hpp +++ b/runtime/gc_modron_standard/UnfinalizedObjectBufferStandard.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNFINALIZEDOBJECTBUFFERSTANDARD_HPP_ diff --git a/runtime/gc_modron_standard/module.xml b/runtime/gc_modron_standard/module.xml index 65459a1ddaf..a13d5c4ad9e 100644 --- a/runtime/gc_modron_standard/module.xml +++ b/runtime/gc_modron_standard/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_modron_startup/CMakeLists.txt b/runtime/gc_modron_startup/CMakeLists.txt index 2baf708d0cb..9c689a42a2d 100644 --- a/runtime/gc_modron_startup/CMakeLists.txt +++ b/runtime/gc_modron_startup/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_modron_startup_sources diff --git a/runtime/gc_modron_startup/GCVerboseInterface.cpp b/runtime/gc_modron_startup/GCVerboseInterface.cpp index ede7e93573a..c4ca8704831 100644 --- a/runtime/gc_modron_startup/GCVerboseInterface.cpp +++ b/runtime/gc_modron_startup/GCVerboseInterface.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_modron_startup/arrayCopy.cpp b/runtime/gc_modron_startup/arrayCopy.cpp index 11975552a56..4b7b4c5c973 100644 --- a/runtime/gc_modron_startup/arrayCopy.cpp +++ b/runtime/gc_modron_startup/arrayCopy.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_startup/gcmspace.cpp b/runtime/gc_modron_startup/gcmspace.cpp index 13ee9bf1f0c..01515bef193 100644 --- a/runtime/gc_modron_startup/gcmspace.cpp +++ b/runtime/gc_modron_startup/gcmspace.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_modron_startup/gcmspace.h b/runtime/gc_modron_startup/gcmspace.h index 929cbb8961b..39063814ecc 100644 --- a/runtime/gc_modron_startup/gcmspace.h +++ b/runtime/gc_modron_startup/gcmspace.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mgcalloc.cpp b/runtime/gc_modron_startup/mgcalloc.cpp index e92f2b70e75..d169837ef6a 100644 --- a/runtime/gc_modron_startup/mgcalloc.cpp +++ b/runtime/gc_modron_startup/mgcalloc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mmhelpers.cpp b/runtime/gc_modron_startup/mmhelpers.cpp index c0e32bb9c83..2dfa8f7c20b 100644 --- a/runtime/gc_modron_startup/mmhelpers.cpp +++ b/runtime/gc_modron_startup/mmhelpers.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mminit.cpp b/runtime/gc_modron_startup/mminit.cpp index 391f444a54e..870ba504d74 100644 --- a/runtime/gc_modron_startup/mminit.cpp +++ b/runtime/gc_modron_startup/mminit.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mminit.h b/runtime/gc_modron_startup/mminit.h index af8acdfbc3e..ed543f32b4c 100644 --- a/runtime/gc_modron_startup/mminit.h +++ b/runtime/gc_modron_startup/mminit.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mmparse.cpp b/runtime/gc_modron_startup/mmparse.cpp index 848e3f76a8a..a9fef2a1a76 100644 --- a/runtime/gc_modron_startup/mmparse.cpp +++ b/runtime/gc_modron_startup/mmparse.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mmparse.h b/runtime/gc_modron_startup/mmparse.h index 2fa39ca25ec..21a9c248c53 100644 --- a/runtime/gc_modron_startup/mmparse.h +++ b/runtime/gc_modron_startup/mmparse.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mmparseXXgc.cpp b/runtime/gc_modron_startup/mmparseXXgc.cpp index 1a773d2691c..4a5bf429495 100644 --- a/runtime/gc_modron_startup/mmparseXXgc.cpp +++ b/runtime/gc_modron_startup/mmparseXXgc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mmparseXgc.cpp b/runtime/gc_modron_startup/mmparseXgc.cpp index 5784f34f837..125efee0c7a 100644 --- a/runtime/gc_modron_startup/mmparseXgc.cpp +++ b/runtime/gc_modron_startup/mmparseXgc.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/mmparseXgcpolicy.cpp b/runtime/gc_modron_startup/mmparseXgcpolicy.cpp index be7ad781bc3..1236e9a4121 100644 --- a/runtime/gc_modron_startup/mmparseXgcpolicy.cpp +++ b/runtime/gc_modron_startup/mmparseXgcpolicy.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_modron_startup/module.xml b/runtime/gc_modron_startup/module.xml index 7c960702942..b97f3796872 100644 --- a/runtime/gc_modron_startup/module.xml +++ b/runtime/gc_modron_startup/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_realtime/AllocationContextRealtime.cpp b/runtime/gc_realtime/AllocationContextRealtime.cpp index 67374bd3a82..806892aa43d 100644 --- a/runtime/gc_realtime/AllocationContextRealtime.cpp +++ b/runtime/gc_realtime/AllocationContextRealtime.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/AllocationContextRealtime.hpp b/runtime/gc_realtime/AllocationContextRealtime.hpp index 611b0223f46..879f842307b 100644 --- a/runtime/gc_realtime/AllocationContextRealtime.hpp +++ b/runtime/gc_realtime/AllocationContextRealtime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/CMakeLists.txt b/runtime/gc_realtime/CMakeLists.txt index a6d81be9da4..5fc798c7b21 100644 --- a/runtime/gc_realtime/CMakeLists.txt +++ b/runtime/gc_realtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_realtime_sources diff --git a/runtime/gc_realtime/ConfigurationRealtime.cpp b/runtime/gc_realtime/ConfigurationRealtime.cpp index 153ca080608..8f9f1ae5be7 100644 --- a/runtime/gc_realtime/ConfigurationRealtime.cpp +++ b/runtime/gc_realtime/ConfigurationRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/ConfigurationRealtime.hpp b/runtime/gc_realtime/ConfigurationRealtime.hpp index 7275859a5ce..049ce370e7c 100644 --- a/runtime/gc_realtime/ConfigurationRealtime.hpp +++ b/runtime/gc_realtime/ConfigurationRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/ContinuationObjectBufferRealtime.cpp b/runtime/gc_realtime/ContinuationObjectBufferRealtime.cpp index 9f39e0348af..da569297b1f 100644 --- a/runtime/gc_realtime/ContinuationObjectBufferRealtime.cpp +++ b/runtime/gc_realtime/ContinuationObjectBufferRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_realtime/ContinuationObjectBufferRealtime.hpp b/runtime/gc_realtime/ContinuationObjectBufferRealtime.hpp index 3a09e0a9a1a..14db498a41a 100644 --- a/runtime/gc_realtime/ContinuationObjectBufferRealtime.hpp +++ b/runtime/gc_realtime/ContinuationObjectBufferRealtime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONTINUATIONOBJECTBUFFERREALTIME_HPP_ diff --git a/runtime/gc_realtime/EnvironmentRealtime.cpp b/runtime/gc_realtime/EnvironmentRealtime.cpp index 8ba348412e8..28b89de724a 100644 --- a/runtime/gc_realtime/EnvironmentRealtime.cpp +++ b/runtime/gc_realtime/EnvironmentRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/EnvironmentRealtime.hpp b/runtime/gc_realtime/EnvironmentRealtime.hpp index 388ba29b297..3f03cd5dc79 100644 --- a/runtime/gc_realtime/EnvironmentRealtime.hpp +++ b/runtime/gc_realtime/EnvironmentRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ENVIRONMENTREALTIME_HPP_) diff --git a/runtime/gc_realtime/GlobalAllocationManagerRealtime.cpp b/runtime/gc_realtime/GlobalAllocationManagerRealtime.cpp index 6052d13be14..7568db5a6de 100644 --- a/runtime/gc_realtime/GlobalAllocationManagerRealtime.cpp +++ b/runtime/gc_realtime/GlobalAllocationManagerRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AllocationContextRealtime.hpp" diff --git a/runtime/gc_realtime/GlobalAllocationManagerRealtime.hpp b/runtime/gc_realtime/GlobalAllocationManagerRealtime.hpp index 44f5bace82c..b48539e5416 100644 --- a/runtime/gc_realtime/GlobalAllocationManagerRealtime.hpp +++ b/runtime/gc_realtime/GlobalAllocationManagerRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(GLOBALALLOCATIONMANAGERREALTIME_HPP_) diff --git a/runtime/gc_realtime/HeapRegionDescriptorRealtime.cpp b/runtime/gc_realtime/HeapRegionDescriptorRealtime.cpp index a8be04e3993..ea6e01f27a7 100644 --- a/runtime/gc_realtime/HeapRegionDescriptorRealtime.cpp +++ b/runtime/gc_realtime/HeapRegionDescriptorRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/HeapRegionDescriptorRealtime.hpp b/runtime/gc_realtime/HeapRegionDescriptorRealtime.hpp index 1e41f5879ef..0fedd30ea89 100644 --- a/runtime/gc_realtime/HeapRegionDescriptorRealtime.hpp +++ b/runtime/gc_realtime/HeapRegionDescriptorRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPREGIONDESCRIPTORREALTIME_HPP) diff --git a/runtime/gc_realtime/IncrementalOverflow.cpp b/runtime/gc_realtime/IncrementalOverflow.cpp index 74ddd4be272..762fbe8fcf7 100644 --- a/runtime/gc_realtime/IncrementalOverflow.cpp +++ b/runtime/gc_realtime/IncrementalOverflow.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/IncrementalOverflow.hpp b/runtime/gc_realtime/IncrementalOverflow.hpp index eaf26f4640d..be16fafe773 100644 --- a/runtime/gc_realtime/IncrementalOverflow.hpp +++ b/runtime/gc_realtime/IncrementalOverflow.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/IncrementalParallelTask.cpp b/runtime/gc_realtime/IncrementalParallelTask.cpp index a79da8c7ae2..2d66cf0d811 100644 --- a/runtime/gc_realtime/IncrementalParallelTask.cpp +++ b/runtime/gc_realtime/IncrementalParallelTask.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "EnvironmentRealtime.hpp" diff --git a/runtime/gc_realtime/IncrementalParallelTask.hpp b/runtime/gc_realtime/IncrementalParallelTask.hpp index fbab3c79be8..f2203d5661c 100644 --- a/runtime/gc_realtime/IncrementalParallelTask.hpp +++ b/runtime/gc_realtime/IncrementalParallelTask.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/MemorySubSpaceMetronome.cpp b/runtime/gc_realtime/MemorySubSpaceMetronome.cpp index eb7ad8b2e7a..5690c4faa87 100644 --- a/runtime/gc_realtime/MemorySubSpaceMetronome.cpp +++ b/runtime/gc_realtime/MemorySubSpaceMetronome.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/MemorySubSpaceMetronome.hpp b/runtime/gc_realtime/MemorySubSpaceMetronome.hpp index d0a74851b7c..70afb0cc9e7 100644 --- a/runtime/gc_realtime/MemorySubSpaceMetronome.hpp +++ b/runtime/gc_realtime/MemorySubSpaceMetronome.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MEMORYSUBSPACEMETRONOME_HPP_) diff --git a/runtime/gc_realtime/Metronome.hpp b/runtime/gc_realtime/Metronome.hpp index 0a5e4edd031..ebe9f3863ba 100644 --- a/runtime/gc_realtime/Metronome.hpp +++ b/runtime/gc_realtime/Metronome.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(METRONOME_HPP_) diff --git a/runtime/gc_realtime/MetronomeAlarm.cpp b/runtime/gc_realtime/MetronomeAlarm.cpp index 613f4fa3e18..92717b2667e 100644 --- a/runtime/gc_realtime/MetronomeAlarm.cpp +++ b/runtime/gc_realtime/MetronomeAlarm.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "EnvironmentBase.hpp" diff --git a/runtime/gc_realtime/MetronomeAlarm.hpp b/runtime/gc_realtime/MetronomeAlarm.hpp index ced054a4bb1..ed84c03aea3 100644 --- a/runtime/gc_realtime/MetronomeAlarm.hpp +++ b/runtime/gc_realtime/MetronomeAlarm.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(METRONOME_ALARM_HPP_) diff --git a/runtime/gc_realtime/MetronomeAlarmThread.cpp b/runtime/gc_realtime/MetronomeAlarmThread.cpp index 7c93286044e..0bb5ad155d5 100644 --- a/runtime/gc_realtime/MetronomeAlarmThread.cpp +++ b/runtime/gc_realtime/MetronomeAlarmThread.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/MetronomeAlarmThread.hpp b/runtime/gc_realtime/MetronomeAlarmThread.hpp index c24855388d3..b28e6d51cd5 100644 --- a/runtime/gc_realtime/MetronomeAlarmThread.hpp +++ b/runtime/gc_realtime/MetronomeAlarmThread.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/OSInterface.cpp b/runtime/gc_realtime/OSInterface.cpp index 8b9fa8b1b54..fb83e70a9bc 100644 --- a/runtime/gc_realtime/OSInterface.cpp +++ b/runtime/gc_realtime/OSInterface.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/OSInterface.hpp b/runtime/gc_realtime/OSInterface.hpp index b06efc065b3..f4b90f21780 100644 --- a/runtime/gc_realtime/OSInterface.hpp +++ b/runtime/gc_realtime/OSInterface.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.cpp b/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.cpp index 5cf7bf4d78e..27e2393b312 100644 --- a/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.cpp +++ b/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.hpp b/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.hpp index 46afb9058b7..33fd1bfc069 100644 --- a/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.hpp +++ b/runtime/gc_realtime/OwnableSynchronizerObjectBufferRealtime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OWNABLESYNCHRONIZEROBJECTBUFFERREALTIME_HPP_ diff --git a/runtime/gc_realtime/ProcessorInfo.cpp b/runtime/gc_realtime/ProcessorInfo.cpp index 1c92fa26a64..5708aea5c2c 100644 --- a/runtime/gc_realtime/ProcessorInfo.cpp +++ b/runtime/gc_realtime/ProcessorInfo.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/ProcessorInfo.hpp b/runtime/gc_realtime/ProcessorInfo.hpp index 92a371f0dc0..c2e1f419d5b 100644 --- a/runtime/gc_realtime/ProcessorInfo.hpp +++ b/runtime/gc_realtime/ProcessorInfo.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/RealtimeAccessBarrier.cpp b/runtime/gc_realtime/RealtimeAccessBarrier.cpp index ee09ce48fb1..f2ee48a8004 100644 --- a/runtime/gc_realtime/RealtimeAccessBarrier.cpp +++ b/runtime/gc_realtime/RealtimeAccessBarrier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ArrayletObjectModel.hpp" diff --git a/runtime/gc_realtime/RealtimeAccessBarrier.hpp b/runtime/gc_realtime/RealtimeAccessBarrier.hpp index 1667e54e9a4..274207052a4 100644 --- a/runtime/gc_realtime/RealtimeAccessBarrier.hpp +++ b/runtime/gc_realtime/RealtimeAccessBarrier.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_realtime/RealtimeGC.cpp b/runtime/gc_realtime/RealtimeGC.cpp index 7c23f5fd181..4aff73fe36b 100644 --- a/runtime/gc_realtime/RealtimeGC.cpp +++ b/runtime/gc_realtime/RealtimeGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/RealtimeGC.hpp b/runtime/gc_realtime/RealtimeGC.hpp index d901899073e..9689ae6a103 100644 --- a/runtime/gc_realtime/RealtimeGC.hpp +++ b/runtime/gc_realtime/RealtimeGC.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/RealtimeMarkTask.cpp b/runtime/gc_realtime/RealtimeMarkTask.cpp index 48058a924d5..23528d3741f 100644 --- a/runtime/gc_realtime/RealtimeMarkTask.cpp +++ b/runtime/gc_realtime/RealtimeMarkTask.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/RealtimeMarkTask.hpp b/runtime/gc_realtime/RealtimeMarkTask.hpp index 06066e3e2c6..4208c5fc52f 100644 --- a/runtime/gc_realtime/RealtimeMarkTask.hpp +++ b/runtime/gc_realtime/RealtimeMarkTask.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REALTIMEMARKTASK_HPP_) diff --git a/runtime/gc_realtime/RealtimeMarkingScheme.cpp b/runtime/gc_realtime/RealtimeMarkingScheme.cpp index dada25386ad..c0ca6a0dc10 100644 --- a/runtime/gc_realtime/RealtimeMarkingScheme.cpp +++ b/runtime/gc_realtime/RealtimeMarkingScheme.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/RealtimeMarkingScheme.hpp b/runtime/gc_realtime/RealtimeMarkingScheme.hpp index c13d0557b8c..4b2e4c2936b 100644 --- a/runtime/gc_realtime/RealtimeMarkingScheme.hpp +++ b/runtime/gc_realtime/RealtimeMarkingScheme.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REALTIMEMARKINGSCHEME_HPP_) diff --git a/runtime/gc_realtime/RealtimeMarkingSchemeRootClearer.hpp b/runtime/gc_realtime/RealtimeMarkingSchemeRootClearer.hpp index bcca3175200..60e2f3766b4 100644 --- a/runtime/gc_realtime/RealtimeMarkingSchemeRootClearer.hpp +++ b/runtime/gc_realtime/RealtimeMarkingSchemeRootClearer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/RealtimeMarkingSchemeRootMarker.hpp b/runtime/gc_realtime/RealtimeMarkingSchemeRootMarker.hpp index 3748808200b..a0d4cfa3c27 100644 --- a/runtime/gc_realtime/RealtimeMarkingSchemeRootMarker.hpp +++ b/runtime/gc_realtime/RealtimeMarkingSchemeRootMarker.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/RealtimeRootScanner.cpp b/runtime/gc_realtime/RealtimeRootScanner.cpp index dca6366f5c2..1bd4543767a 100644 --- a/runtime/gc_realtime/RealtimeRootScanner.cpp +++ b/runtime/gc_realtime/RealtimeRootScanner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_realtime/RealtimeRootScanner.hpp b/runtime/gc_realtime/RealtimeRootScanner.hpp index 6a5d0f92775..63051730d73 100644 --- a/runtime/gc_realtime/RealtimeRootScanner.hpp +++ b/runtime/gc_realtime/RealtimeRootScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/RealtimeSweepTask.cpp b/runtime/gc_realtime/RealtimeSweepTask.cpp index 9bd44e4051b..6aa5501706e 100644 --- a/runtime/gc_realtime/RealtimeSweepTask.cpp +++ b/runtime/gc_realtime/RealtimeSweepTask.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_realtime/RealtimeSweepTask.hpp b/runtime/gc_realtime/RealtimeSweepTask.hpp index a4e5abae900..f2fb0e81832 100644 --- a/runtime/gc_realtime/RealtimeSweepTask.hpp +++ b/runtime/gc_realtime/RealtimeSweepTask.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REALTIMESWEEPTASK_HPP_) diff --git a/runtime/gc_realtime/ReferenceObjectBufferRealtime.cpp b/runtime/gc_realtime/ReferenceObjectBufferRealtime.cpp index a48d18e06f3..a840ff47ec5 100644 --- a/runtime/gc_realtime/ReferenceObjectBufferRealtime.cpp +++ b/runtime/gc_realtime/ReferenceObjectBufferRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_realtime/ReferenceObjectBufferRealtime.hpp b/runtime/gc_realtime/ReferenceObjectBufferRealtime.hpp index 93c9e1be7b1..801022a1e77 100644 --- a/runtime/gc_realtime/ReferenceObjectBufferRealtime.hpp +++ b/runtime/gc_realtime/ReferenceObjectBufferRealtime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REFERENCEOBJECTBUFFERREALTIME_HPP_ diff --git a/runtime/gc_realtime/Scheduler.cpp b/runtime/gc_realtime/Scheduler.cpp index cc8f1a1000c..f45eb7e7b8d 100644 --- a/runtime/gc_realtime/Scheduler.cpp +++ b/runtime/gc_realtime/Scheduler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/Scheduler.hpp b/runtime/gc_realtime/Scheduler.hpp index 7a5feafe3f9..29465e80795 100644 --- a/runtime/gc_realtime/Scheduler.hpp +++ b/runtime/gc_realtime/Scheduler.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/SweepSchemeRealtime.cpp b/runtime/gc_realtime/SweepSchemeRealtime.cpp index 029684e7d41..b03eac83408 100644 --- a/runtime/gc_realtime/SweepSchemeRealtime.cpp +++ b/runtime/gc_realtime/SweepSchemeRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "GCExtensionsBase.hpp" diff --git a/runtime/gc_realtime/SweepSchemeRealtime.hpp b/runtime/gc_realtime/SweepSchemeRealtime.hpp index 1fd8a21fd53..74bd884789e 100644 --- a/runtime/gc_realtime/SweepSchemeRealtime.hpp +++ b/runtime/gc_realtime/SweepSchemeRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SWEEPSCHEMEREALTIME_HPP_) diff --git a/runtime/gc_realtime/Timer.cpp b/runtime/gc_realtime/Timer.cpp index 39330596d9d..ec17e17a2ee 100644 --- a/runtime/gc_realtime/Timer.cpp +++ b/runtime/gc_realtime/Timer.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/Timer.hpp b/runtime/gc_realtime/Timer.hpp index 1147bfac7ee..5bc4b528fbc 100644 --- a/runtime/gc_realtime/Timer.hpp +++ b/runtime/gc_realtime/Timer.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TIMER_HPP_) diff --git a/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.cpp b/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.cpp index 7bf7994da8b..72fde3762f8 100644 --- a/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.cpp +++ b/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.hpp b/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.hpp index 246e4c58d0a..2bdf95270fa 100644 --- a/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.hpp +++ b/runtime/gc_realtime/UnfinalizedObjectBufferRealtime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNFINALIZEDOBJECTBUFFERREALTIME_HPP_ diff --git a/runtime/gc_realtime/UtilizationTracker.cpp b/runtime/gc_realtime/UtilizationTracker.cpp index 9342c609b93..2da342d1533 100644 --- a/runtime/gc_realtime/UtilizationTracker.cpp +++ b/runtime/gc_realtime/UtilizationTracker.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/UtilizationTracker.hpp b/runtime/gc_realtime/UtilizationTracker.hpp index 72ee6121b2c..06b4d3bd3ad 100644 --- a/runtime/gc_realtime/UtilizationTracker.hpp +++ b/runtime/gc_realtime/UtilizationTracker.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_realtime/WorkPacketsRealtime.cpp b/runtime/gc_realtime/WorkPacketsRealtime.cpp index 8e10506bd8e..ca6d66aec33 100644 --- a/runtime/gc_realtime/WorkPacketsRealtime.cpp +++ b/runtime/gc_realtime/WorkPacketsRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/gc_realtime/WorkPacketsRealtime.hpp b/runtime/gc_realtime/WorkPacketsRealtime.hpp index 40111d93a95..158fcc4ab2c 100644 --- a/runtime/gc_realtime/WorkPacketsRealtime.hpp +++ b/runtime/gc_realtime/WorkPacketsRealtime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(WORKPACKETSREALTIME_HPP_) diff --git a/runtime/gc_realtime/YieldCollaborator.cpp b/runtime/gc_realtime/YieldCollaborator.cpp index c4a37fafafd..e64c026779d 100644 --- a/runtime/gc_realtime/YieldCollaborator.cpp +++ b/runtime/gc_realtime/YieldCollaborator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "YieldCollaborator.hpp" diff --git a/runtime/gc_realtime/YieldCollaborator.hpp b/runtime/gc_realtime/YieldCollaborator.hpp index 161133c9028..49032718ee5 100644 --- a/runtime/gc_realtime/YieldCollaborator.hpp +++ b/runtime/gc_realtime/YieldCollaborator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(YIELDCOLLABORATOR_HPP_) #define YIELDCOLLABORATOR_HPP_ diff --git a/runtime/gc_realtime/module.xml b/runtime/gc_realtime/module.xml index 65824d4ecf9..5e908115077 100644 --- a/runtime/gc_realtime/module.xml +++ b/runtime/gc_realtime/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_stats/CMakeLists.txt b/runtime/gc_stats/CMakeLists.txt index d7c224f6cf4..f11a915cda6 100644 --- a/runtime/gc_stats/CMakeLists.txt +++ b/runtime/gc_stats/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_stats_sources diff --git a/runtime/gc_stats/CopyForwardStats.cpp b/runtime/gc_stats/CopyForwardStats.cpp index baafd2efa7d..8beb492ef4f 100644 --- a/runtime/gc_stats/CopyForwardStats.cpp +++ b/runtime/gc_stats/CopyForwardStats.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CopyForwardStats.hpp" diff --git a/runtime/gc_stats/CopyForwardStats.hpp b/runtime/gc_stats/CopyForwardStats.hpp index 3832f390ac1..93be6a3efca 100644 --- a/runtime/gc_stats/CopyForwardStats.hpp +++ b/runtime/gc_stats/CopyForwardStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_stats/FrequentObjectsStats.cpp b/runtime/gc_stats/FrequentObjectsStats.cpp index 05cc65e6758..707df9676a0 100644 --- a/runtime/gc_stats/FrequentObjectsStats.cpp +++ b/runtime/gc_stats/FrequentObjectsStats.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "FrequentObjectsStats.hpp" diff --git a/runtime/gc_stats/FrequentObjectsStats.hpp b/runtime/gc_stats/FrequentObjectsStats.hpp index 1adcd8fb5cd..87649c47953 100644 --- a/runtime/gc_stats/FrequentObjectsStats.hpp +++ b/runtime/gc_stats/FrequentObjectsStats.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_stats/MarkJavaStats.cpp b/runtime/gc_stats/MarkJavaStats.cpp index dc8b58bf85e..96f28fc6f6f 100644 --- a/runtime/gc_stats/MarkJavaStats.cpp +++ b/runtime/gc_stats/MarkJavaStats.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/gc_stats/MarkJavaStats.hpp b/runtime/gc_stats/MarkJavaStats.hpp index 7559fbf1081..59069fca1bb 100644 --- a/runtime/gc_stats/MarkJavaStats.hpp +++ b/runtime/gc_stats/MarkJavaStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MARKJAVASTATS_HPP_) diff --git a/runtime/gc_stats/MarkVLHGCStats.hpp b/runtime/gc_stats/MarkVLHGCStats.hpp index c024d48f379..cbb154b4e95 100644 --- a/runtime/gc_stats/MarkVLHGCStats.hpp +++ b/runtime/gc_stats/MarkVLHGCStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_stats/ScanClassesMode.hpp b/runtime/gc_stats/ScanClassesMode.hpp index a0718d7d95f..acf3d824a76 100644 --- a/runtime/gc_stats/ScanClassesMode.hpp +++ b/runtime/gc_stats/ScanClassesMode.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_stats/ScavengerJavaStats.cpp b/runtime/gc_stats/ScavengerJavaStats.cpp index e12f4f3a310..1aad096106a 100644 --- a/runtime/gc_stats/ScavengerJavaStats.cpp +++ b/runtime/gc_stats/ScavengerJavaStats.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ScavengerJavaStats.hpp" diff --git a/runtime/gc_stats/ScavengerJavaStats.hpp b/runtime/gc_stats/ScavengerJavaStats.hpp index 3f872db887e..47e6dffe124 100644 --- a/runtime/gc_stats/ScavengerJavaStats.hpp +++ b/runtime/gc_stats/ScavengerJavaStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_stats/VLHGCCycleStats.hpp b/runtime/gc_stats/VLHGCCycleStats.hpp index 8491dade004..b1414ef96ae 100644 --- a/runtime/gc_stats/VLHGCCycleStats.hpp +++ b/runtime/gc_stats/VLHGCCycleStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_stats/VLHGCIncrementStats.hpp b/runtime/gc_stats/VLHGCIncrementStats.hpp index 68c97878324..b0fc7aaa73b 100644 --- a/runtime/gc_stats/VLHGCIncrementStats.hpp +++ b/runtime/gc_stats/VLHGCIncrementStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_stats/module.xml b/runtime/gc_stats/module.xml index 937dad17400..12418286b5d 100644 --- a/runtime/gc_stats/module.xml +++ b/runtime/gc_stats/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_structs/ArrayletLeafIterator.cpp b/runtime/gc_structs/ArrayletLeafIterator.cpp index 1b2e025f6b8..320a5547bb4 100644 --- a/runtime/gc_structs/ArrayletLeafIterator.cpp +++ b/runtime/gc_structs/ArrayletLeafIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ArrayletLeafIterator.hpp b/runtime/gc_structs/ArrayletLeafIterator.hpp index e9ac700b8d2..93ae6978d65 100644 --- a/runtime/gc_structs/ArrayletLeafIterator.hpp +++ b/runtime/gc_structs/ArrayletLeafIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/CMakeLists.txt b/runtime/gc_structs/CMakeLists.txt index 7b7f76d12bd..9fdebffe041 100644 --- a/runtime/gc_structs/CMakeLists.txt +++ b/runtime/gc_structs/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_structs_sources diff --git a/runtime/gc_structs/CallSitesIterator.cpp b/runtime/gc_structs/CallSitesIterator.cpp index 1673724ae10..a43edbb8b92 100644 --- a/runtime/gc_structs/CallSitesIterator.cpp +++ b/runtime/gc_structs/CallSitesIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/CallSitesIterator.hpp b/runtime/gc_structs/CallSitesIterator.hpp index 2c6092dd83f..b1070d37a7b 100644 --- a/runtime/gc_structs/CallSitesIterator.hpp +++ b/runtime/gc_structs/CallSitesIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassArrayClassSlotIterator.cpp b/runtime/gc_structs/ClassArrayClassSlotIterator.cpp index 40a70f06bbb..219e70a7a40 100644 --- a/runtime/gc_structs/ClassArrayClassSlotIterator.cpp +++ b/runtime/gc_structs/ClassArrayClassSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassArrayClassSlotIterator.hpp b/runtime/gc_structs/ClassArrayClassSlotIterator.hpp index d8cd75fd7df..f40434acb60 100644 --- a/runtime/gc_structs/ClassArrayClassSlotIterator.hpp +++ b/runtime/gc_structs/ClassArrayClassSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassFCCSlotIterator.cpp b/runtime/gc_structs/ClassFCCSlotIterator.cpp index 4b93ee00a03..4e3f78f2bfd 100644 --- a/runtime/gc_structs/ClassFCCSlotIterator.cpp +++ b/runtime/gc_structs/ClassFCCSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassFCCSlotIterator.hpp b/runtime/gc_structs/ClassFCCSlotIterator.hpp index d3af34d7ee2..fc33c5049f6 100644 --- a/runtime/gc_structs/ClassFCCSlotIterator.hpp +++ b/runtime/gc_structs/ClassFCCSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassHeapIterator.cpp b/runtime/gc_structs/ClassHeapIterator.cpp index 1e7780228ff..c184599f936 100644 --- a/runtime/gc_structs/ClassHeapIterator.cpp +++ b/runtime/gc_structs/ClassHeapIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassHeapIterator.hpp b/runtime/gc_structs/ClassHeapIterator.hpp index d4e553f0852..654d1c56bf6 100644 --- a/runtime/gc_structs/ClassHeapIterator.hpp +++ b/runtime/gc_structs/ClassHeapIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassIterator.cpp b/runtime/gc_structs/ClassIterator.cpp index 3d8b43189ab..5ea71d64db3 100644 --- a/runtime/gc_structs/ClassIterator.cpp +++ b/runtime/gc_structs/ClassIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassIterator.hpp b/runtime/gc_structs/ClassIterator.hpp index d05667740bf..c67ed19ff43 100644 --- a/runtime/gc_structs/ClassIterator.hpp +++ b/runtime/gc_structs/ClassIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassIteratorClassSlots.cpp b/runtime/gc_structs/ClassIteratorClassSlots.cpp index eb6c0a69c0b..a480d747001 100644 --- a/runtime/gc_structs/ClassIteratorClassSlots.cpp +++ b/runtime/gc_structs/ClassIteratorClassSlots.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassIteratorClassSlots.hpp b/runtime/gc_structs/ClassIteratorClassSlots.hpp index a59f77ce270..9a7483c4449 100644 --- a/runtime/gc_structs/ClassIteratorClassSlots.hpp +++ b/runtime/gc_structs/ClassIteratorClassSlots.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassIteratorDeclarationOrder.cpp b/runtime/gc_structs/ClassIteratorDeclarationOrder.cpp index 2960c1b5d3a..74e3ee7ff09 100644 --- a/runtime/gc_structs/ClassIteratorDeclarationOrder.cpp +++ b/runtime/gc_structs/ClassIteratorDeclarationOrder.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassIteratorDeclarationOrder.hpp b/runtime/gc_structs/ClassIteratorDeclarationOrder.hpp index 0b8a3bb3a6b..e9424e8c609 100644 --- a/runtime/gc_structs/ClassIteratorDeclarationOrder.hpp +++ b/runtime/gc_structs/ClassIteratorDeclarationOrder.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassLoaderClassesIterator.cpp b/runtime/gc_structs/ClassLoaderClassesIterator.cpp index b19e43f550e..e22d9028d5b 100644 --- a/runtime/gc_structs/ClassLoaderClassesIterator.cpp +++ b/runtime/gc_structs/ClassLoaderClassesIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassLoaderClassesIterator.hpp b/runtime/gc_structs/ClassLoaderClassesIterator.hpp index be67f2394ad..f2e925a1e3f 100644 --- a/runtime/gc_structs/ClassLoaderClassesIterator.hpp +++ b/runtime/gc_structs/ClassLoaderClassesIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassLoaderIterator.hpp b/runtime/gc_structs/ClassLoaderIterator.hpp index 18ab3b205ea..fc0dc1e7cfc 100644 --- a/runtime/gc_structs/ClassLoaderIterator.hpp +++ b/runtime/gc_structs/ClassLoaderIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassLoaderSegmentIterator.cpp b/runtime/gc_structs/ClassLoaderSegmentIterator.cpp index 2a4a8c3b0c9..26d3a2070d0 100644 --- a/runtime/gc_structs/ClassLoaderSegmentIterator.cpp +++ b/runtime/gc_structs/ClassLoaderSegmentIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_structs/ClassLoaderSegmentIterator.hpp b/runtime/gc_structs/ClassLoaderSegmentIterator.hpp index 782c17048c4..3fd2f4ce630 100644 --- a/runtime/gc_structs/ClassLoaderSegmentIterator.hpp +++ b/runtime/gc_structs/ClassLoaderSegmentIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CLASSLOADERSEGMENTITERATOR_HPP_) diff --git a/runtime/gc_structs/ClassLocalInterfaceIterator.cpp b/runtime/gc_structs/ClassLocalInterfaceIterator.cpp index f2c0f1103d2..36009437e94 100644 --- a/runtime/gc_structs/ClassLocalInterfaceIterator.cpp +++ b/runtime/gc_structs/ClassLocalInterfaceIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassLocalInterfaceIterator.hpp b/runtime/gc_structs/ClassLocalInterfaceIterator.hpp index 9bdc9fc8224..6d7c3c1e7f7 100644 --- a/runtime/gc_structs/ClassLocalInterfaceIterator.hpp +++ b/runtime/gc_structs/ClassLocalInterfaceIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.cpp b/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.cpp index 975798bb5be..413b84f585a 100644 --- a/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.cpp +++ b/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.hpp b/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.hpp index b5755367fba..f4e9ce806d4 100644 --- a/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.hpp +++ b/runtime/gc_structs/ClassStaticsDeclarationOrderIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassStaticsIterator.cpp b/runtime/gc_structs/ClassStaticsIterator.cpp index 97be47fef97..62712116a6f 100644 --- a/runtime/gc_structs/ClassStaticsIterator.cpp +++ b/runtime/gc_structs/ClassStaticsIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassStaticsIterator.hpp b/runtime/gc_structs/ClassStaticsIterator.hpp index 7d51852fa9e..a8fed141030 100644 --- a/runtime/gc_structs/ClassStaticsIterator.hpp +++ b/runtime/gc_structs/ClassStaticsIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassSuperclassesIterator.cpp b/runtime/gc_structs/ClassSuperclassesIterator.cpp index 3a45537d069..7656d1ce3b6 100644 --- a/runtime/gc_structs/ClassSuperclassesIterator.cpp +++ b/runtime/gc_structs/ClassSuperclassesIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ClassSuperclassesIterator.hpp b/runtime/gc_structs/ClassSuperclassesIterator.hpp index 87de81eda5a..14a21ad6c68 100644 --- a/runtime/gc_structs/ClassSuperclassesIterator.hpp +++ b/runtime/gc_structs/ClassSuperclassesIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ConstantDynamicSlotIterator.cpp b/runtime/gc_structs/ConstantDynamicSlotIterator.cpp index 3a2f651119d..8a4491db728 100644 --- a/runtime/gc_structs/ConstantDynamicSlotIterator.cpp +++ b/runtime/gc_structs/ConstantDynamicSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ConstantDynamicSlotIterator.hpp b/runtime/gc_structs/ConstantDynamicSlotIterator.hpp index 83f7fd47686..c2faf5721b0 100644 --- a/runtime/gc_structs/ConstantDynamicSlotIterator.hpp +++ b/runtime/gc_structs/ConstantDynamicSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ConstantPoolClassSlotIterator.cpp b/runtime/gc_structs/ConstantPoolClassSlotIterator.cpp index 933176d4e04..3892cc20aea 100644 --- a/runtime/gc_structs/ConstantPoolClassSlotIterator.cpp +++ b/runtime/gc_structs/ConstantPoolClassSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ConstantPoolClassSlotIterator.hpp b/runtime/gc_structs/ConstantPoolClassSlotIterator.hpp index 3b4916da5b0..e60799655ab 100644 --- a/runtime/gc_structs/ConstantPoolClassSlotIterator.hpp +++ b/runtime/gc_structs/ConstantPoolClassSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ConstantPoolObjectSlotIterator.cpp b/runtime/gc_structs/ConstantPoolObjectSlotIterator.cpp index d1372bcaa4b..b5eb8eae4bd 100644 --- a/runtime/gc_structs/ConstantPoolObjectSlotIterator.cpp +++ b/runtime/gc_structs/ConstantPoolObjectSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ConstantPoolObjectSlotIterator.hpp b/runtime/gc_structs/ConstantPoolObjectSlotIterator.hpp index fd66c786468..a60cbc6a4c2 100644 --- a/runtime/gc_structs/ConstantPoolObjectSlotIterator.hpp +++ b/runtime/gc_structs/ConstantPoolObjectSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/FlattenedContiguousArrayIterator.cpp b/runtime/gc_structs/FlattenedContiguousArrayIterator.cpp index 746be92ebf6..2f89b09209a 100644 --- a/runtime/gc_structs/FlattenedContiguousArrayIterator.cpp +++ b/runtime/gc_structs/FlattenedContiguousArrayIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/FlattenedContiguousArrayIterator.hpp b/runtime/gc_structs/FlattenedContiguousArrayIterator.hpp index e3124618d48..61c71115772 100644 --- a/runtime/gc_structs/FlattenedContiguousArrayIterator.hpp +++ b/runtime/gc_structs/FlattenedContiguousArrayIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/JVMTIObjectTagTableIterator.cpp b/runtime/gc_structs/JVMTIObjectTagTableIterator.cpp index a4a0d0fb98e..9bbbff55f3b 100644 --- a/runtime/gc_structs/JVMTIObjectTagTableIterator.cpp +++ b/runtime/gc_structs/JVMTIObjectTagTableIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/JVMTIObjectTagTableIterator.hpp b/runtime/gc_structs/JVMTIObjectTagTableIterator.hpp index c448a6f582a..7eddbd11edb 100644 --- a/runtime/gc_structs/JVMTIObjectTagTableIterator.hpp +++ b/runtime/gc_structs/JVMTIObjectTagTableIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/MethodTypesIterator.cpp b/runtime/gc_structs/MethodTypesIterator.cpp index 44d27354ef2..cc3e621f5f4 100644 --- a/runtime/gc_structs/MethodTypesIterator.cpp +++ b/runtime/gc_structs/MethodTypesIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/MethodTypesIterator.hpp b/runtime/gc_structs/MethodTypesIterator.hpp index 100fd35668a..5175f3c4bf8 100644 --- a/runtime/gc_structs/MethodTypesIterator.hpp +++ b/runtime/gc_structs/MethodTypesIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/MixedObjectDeclarationOrderIterator.cpp b/runtime/gc_structs/MixedObjectDeclarationOrderIterator.cpp index e21d6103ec0..f83dc6c9ab9 100644 --- a/runtime/gc_structs/MixedObjectDeclarationOrderIterator.cpp +++ b/runtime/gc_structs/MixedObjectDeclarationOrderIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/MixedObjectDeclarationOrderIterator.hpp b/runtime/gc_structs/MixedObjectDeclarationOrderIterator.hpp index 939819008ca..355e4d3d5e9 100644 --- a/runtime/gc_structs/MixedObjectDeclarationOrderIterator.hpp +++ b/runtime/gc_structs/MixedObjectDeclarationOrderIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/MixedObjectIterator.cpp b/runtime/gc_structs/MixedObjectIterator.cpp index 332b0b36bf8..dfac56d56b1 100644 --- a/runtime/gc_structs/MixedObjectIterator.cpp +++ b/runtime/gc_structs/MixedObjectIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/MixedObjectIterator.hpp b/runtime/gc_structs/MixedObjectIterator.hpp index 2b2eeea1453..b0318382833 100644 --- a/runtime/gc_structs/MixedObjectIterator.hpp +++ b/runtime/gc_structs/MixedObjectIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/PointerArrayIterator.cpp b/runtime/gc_structs/PointerArrayIterator.cpp index 67e331351b7..6672ec688ee 100644 --- a/runtime/gc_structs/PointerArrayIterator.cpp +++ b/runtime/gc_structs/PointerArrayIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/PointerArrayIterator.hpp b/runtime/gc_structs/PointerArrayIterator.hpp index 7bccb9ed0dd..d0c8de1a494 100644 --- a/runtime/gc_structs/PointerArrayIterator.hpp +++ b/runtime/gc_structs/PointerArrayIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/PointerArrayletInlineLeafIterator.hpp b/runtime/gc_structs/PointerArrayletInlineLeafIterator.hpp index 4b503f9820b..dd6937ca7b4 100644 --- a/runtime/gc_structs/PointerArrayletInlineLeafIterator.hpp +++ b/runtime/gc_structs/PointerArrayletInlineLeafIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/PointerArrayletIterator.hpp b/runtime/gc_structs/PointerArrayletIterator.hpp index a975696c2cf..195ae016f3a 100644 --- a/runtime/gc_structs/PointerArrayletIterator.hpp +++ b/runtime/gc_structs/PointerArrayletIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/PointerContiguousArrayIterator.hpp b/runtime/gc_structs/PointerContiguousArrayIterator.hpp index 17125bcb905..e334b073c1e 100644 --- a/runtime/gc_structs/PointerContiguousArrayIterator.hpp +++ b/runtime/gc_structs/PointerContiguousArrayIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/SegmentIterator.cpp b/runtime/gc_structs/SegmentIterator.cpp index 403d97fff83..127fb117506 100644 --- a/runtime/gc_structs/SegmentIterator.cpp +++ b/runtime/gc_structs/SegmentIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/SegmentIterator.hpp b/runtime/gc_structs/SegmentIterator.hpp index 13341b11bbc..df59007f919 100644 --- a/runtime/gc_structs/SegmentIterator.hpp +++ b/runtime/gc_structs/SegmentIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/StringTableIncrementalIterator.cpp b/runtime/gc_structs/StringTableIncrementalIterator.cpp index 9be7e961237..8a967c2de79 100644 --- a/runtime/gc_structs/StringTableIncrementalIterator.cpp +++ b/runtime/gc_structs/StringTableIncrementalIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/StringTableIncrementalIterator.hpp b/runtime/gc_structs/StringTableIncrementalIterator.hpp index 2c5a45d5639..8baefe26b9f 100644 --- a/runtime/gc_structs/StringTableIncrementalIterator.hpp +++ b/runtime/gc_structs/StringTableIncrementalIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMClassSlotIterator.cpp b/runtime/gc_structs/VMClassSlotIterator.cpp index 8f3fe5b4ffb..b547e646210 100644 --- a/runtime/gc_structs/VMClassSlotIterator.cpp +++ b/runtime/gc_structs/VMClassSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMClassSlotIterator.hpp b/runtime/gc_structs/VMClassSlotIterator.hpp index 05e83f7a1a1..578d1c23485 100644 --- a/runtime/gc_structs/VMClassSlotIterator.hpp +++ b/runtime/gc_structs/VMClassSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadIterator.cpp b/runtime/gc_structs/VMThreadIterator.cpp index d0e9f8763a2..50344b51546 100644 --- a/runtime/gc_structs/VMThreadIterator.cpp +++ b/runtime/gc_structs/VMThreadIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadIterator.hpp b/runtime/gc_structs/VMThreadIterator.hpp index 64edf2cba56..78386a3ee25 100644 --- a/runtime/gc_structs/VMThreadIterator.hpp +++ b/runtime/gc_structs/VMThreadIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadJNISlotIterator.cpp b/runtime/gc_structs/VMThreadJNISlotIterator.cpp index 0ba02756492..25b7f25c476 100644 --- a/runtime/gc_structs/VMThreadJNISlotIterator.cpp +++ b/runtime/gc_structs/VMThreadJNISlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadJNISlotIterator.hpp b/runtime/gc_structs/VMThreadJNISlotIterator.hpp index c999da5be10..5ab803e6f11 100644 --- a/runtime/gc_structs/VMThreadJNISlotIterator.hpp +++ b/runtime/gc_structs/VMThreadJNISlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadListIterator.cpp b/runtime/gc_structs/VMThreadListIterator.cpp index 49e11604268..44316878fa5 100644 --- a/runtime/gc_structs/VMThreadListIterator.cpp +++ b/runtime/gc_structs/VMThreadListIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadListIterator.hpp b/runtime/gc_structs/VMThreadListIterator.hpp index 570d142eff8..4b9fba1f35b 100644 --- a/runtime/gc_structs/VMThreadListIterator.hpp +++ b/runtime/gc_structs/VMThreadListIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.cpp b/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.cpp index 410eb4ff1b6..9185a9025b3 100644 --- a/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.cpp +++ b/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.hpp b/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.hpp index b5211bc3e36..69a0e21aab3 100644 --- a/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.hpp +++ b/runtime/gc_structs/VMThreadMonitorRecordSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadSlotIterator.cpp b/runtime/gc_structs/VMThreadSlotIterator.cpp index c2d88403061..2511c3b4c22 100644 --- a/runtime/gc_structs/VMThreadSlotIterator.cpp +++ b/runtime/gc_structs/VMThreadSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadSlotIterator.hpp b/runtime/gc_structs/VMThreadSlotIterator.hpp index f6ff5b15daa..9a85f687a82 100644 --- a/runtime/gc_structs/VMThreadSlotIterator.hpp +++ b/runtime/gc_structs/VMThreadSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadStackSlotIterator.cpp b/runtime/gc_structs/VMThreadStackSlotIterator.cpp index fb25215e2df..92142fdd987 100644 --- a/runtime/gc_structs/VMThreadStackSlotIterator.cpp +++ b/runtime/gc_structs/VMThreadStackSlotIterator.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/VMThreadStackSlotIterator.hpp b/runtime/gc_structs/VMThreadStackSlotIterator.hpp index b3db9cd1932..d7ca30c41c5 100644 --- a/runtime/gc_structs/VMThreadStackSlotIterator.hpp +++ b/runtime/gc_structs/VMThreadStackSlotIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/ValueTypesIterator.hpp b/runtime/gc_structs/ValueTypesIterator.hpp index 1efc37d1f11..bdbe3225aad 100644 --- a/runtime/gc_structs/ValueTypesIterator.hpp +++ b/runtime/gc_structs/ValueTypesIterator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_structs/module.xml b/runtime/gc_structs/module.xml index beada882e1c..5a7087154c9 100644 --- a/runtime/gc_structs/module.xml +++ b/runtime/gc_structs/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_tests/CMakeLists.txt b/runtime/gc_tests/CMakeLists.txt index f1eaafbf628..167c0016ba2 100644 --- a/runtime/gc_tests/CMakeLists.txt +++ b/runtime/gc_tests/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_subdirectory(hooktests) diff --git a/runtime/gc_tests/hooktests/CMakeLists.txt b/runtime/gc_tests/hooktests/CMakeLists.txt index 8a4325a9922..e3379c70974 100644 --- a/runtime/gc_tests/hooktests/CMakeLists.txt +++ b/runtime/gc_tests/hooktests/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(hooktests SHARED diff --git a/runtime/gc_tests/hooktests/gc_hooktests.c b/runtime/gc_tests/hooktests/gc_hooktests.c index 6efe9c1c233..8129334d2b1 100644 --- a/runtime/gc_tests/hooktests/gc_hooktests.c +++ b/runtime/gc_tests/hooktests/gc_hooktests.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" #include "j9.h" diff --git a/runtime/gc_tests/hooktests/gc_hooktests.h b/runtime/gc_tests/hooktests/gc_hooktests.h index c78d753a352..63e390ee37f 100644 --- a/runtime/gc_tests/hooktests/gc_hooktests.h +++ b/runtime/gc_tests/hooktests/gc_hooktests.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef gc_hooktests_h #define gc_hooktests_h diff --git a/runtime/gc_tests/hooktests/module.xml b/runtime/gc_tests/hooktests/module.xml index 5153eeebe75..0ec5a631ace 100644 --- a/runtime/gc_tests/hooktests/module.xml +++ b/runtime/gc_tests/hooktests/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_tests/rwlocktests/CMakeLists.txt b/runtime/gc_tests/rwlocktests/CMakeLists.txt index dc262eb3303..1d8b4a14127 100644 --- a/runtime/gc_tests/rwlocktests/CMakeLists.txt +++ b/runtime/gc_tests/rwlocktests/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_rwlocktest_sources diff --git a/runtime/gc_tests/rwlocktests/gc_rwlocktest.cpp b/runtime/gc_tests/rwlocktests/gc_rwlocktest.cpp index 37cc84c0d8e..609a27b96ea 100644 --- a/runtime/gc_tests/rwlocktests/gc_rwlocktest.cpp +++ b/runtime/gc_tests/rwlocktests/gc_rwlocktest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CuTest.h" #include "j9.h" diff --git a/runtime/gc_tests/rwlocktests/main.cpp b/runtime/gc_tests/rwlocktests/main.cpp index b11ff004730..0c605ee96a6 100644 --- a/runtime/gc_tests/rwlocktests/main.cpp +++ b/runtime/gc_tests/rwlocktests/main.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_tests/rwlocktests/module.xml b/runtime/gc_tests/rwlocktests/module.xml index ef6f94cbed1..4959d06f3da 100644 --- a/runtime/gc_tests/rwlocktests/module.xml +++ b/runtime/gc_tests/rwlocktests/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_trace/CMakeLists.txt b/runtime/gc_trace/CMakeLists.txt index a5fe56e3709..298dfcc037e 100644 --- a/runtime/gc_trace/CMakeLists.txt +++ b/runtime/gc_trace/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_trace_sources diff --git a/runtime/gc_trace/Tgc.cpp b/runtime/gc_trace/Tgc.cpp index b11ae5318a1..461bbe2f5b3 100644 --- a/runtime/gc_trace/Tgc.cpp +++ b/runtime/gc_trace/Tgc.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/Tgc.hpp b/runtime/gc_trace/Tgc.hpp index 7f52387c853..48fbde1fd74 100644 --- a/runtime/gc_trace/Tgc.hpp +++ b/runtime/gc_trace/Tgc.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcAllocation.cpp b/runtime/gc_trace/TgcAllocation.cpp index 6564ec8b148..482bc1f33b4 100644 --- a/runtime/gc_trace/TgcAllocation.cpp +++ b/runtime/gc_trace/TgcAllocation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcAllocation.hpp b/runtime/gc_trace/TgcAllocation.hpp index 1ed0c903865..1113609e70a 100644 --- a/runtime/gc_trace/TgcAllocation.hpp +++ b/runtime/gc_trace/TgcAllocation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TGCALLOCATION_HPP_) diff --git a/runtime/gc_trace/TgcAllocationContext.cpp b/runtime/gc_trace/TgcAllocationContext.cpp index 94f6f089ddb..01cc8d14842 100644 --- a/runtime/gc_trace/TgcAllocationContext.cpp +++ b/runtime/gc_trace/TgcAllocationContext.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcAllocationContext.hpp b/runtime/gc_trace/TgcAllocationContext.hpp index e417b55f5e8..d1399773e91 100644 --- a/runtime/gc_trace/TgcAllocationContext.hpp +++ b/runtime/gc_trace/TgcAllocationContext.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcBacktrace.cpp b/runtime/gc_trace/TgcBacktrace.cpp index a29da489cae..d909f22085f 100644 --- a/runtime/gc_trace/TgcBacktrace.cpp +++ b/runtime/gc_trace/TgcBacktrace.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcBacktrace.hpp b/runtime/gc_trace/TgcBacktrace.hpp index 10edb1e3727..7844988273c 100644 --- a/runtime/gc_trace/TgcBacktrace.hpp +++ b/runtime/gc_trace/TgcBacktrace.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcCardCleaning.cpp b/runtime/gc_trace/TgcCardCleaning.cpp index 40e67f9e9ff..e5870a83ba3 100644 --- a/runtime/gc_trace/TgcCardCleaning.cpp +++ b/runtime/gc_trace/TgcCardCleaning.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcCardCleaning.hpp b/runtime/gc_trace/TgcCardCleaning.hpp index adfd4ae7f20..7a0bee401a4 100644 --- a/runtime/gc_trace/TgcCardCleaning.hpp +++ b/runtime/gc_trace/TgcCardCleaning.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcConcurrent.cpp b/runtime/gc_trace/TgcConcurrent.cpp index d4513e8d514..e513c1559f4 100644 --- a/runtime/gc_trace/TgcConcurrent.cpp +++ b/runtime/gc_trace/TgcConcurrent.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcConcurrent.hpp b/runtime/gc_trace/TgcConcurrent.hpp index 8f5c58cf169..351ad28dd09 100644 --- a/runtime/gc_trace/TgcConcurrent.hpp +++ b/runtime/gc_trace/TgcConcurrent.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcConcurrentcardcleaning.cpp b/runtime/gc_trace/TgcConcurrentcardcleaning.cpp index 740f388e389..ac961240792 100644 --- a/runtime/gc_trace/TgcConcurrentcardcleaning.cpp +++ b/runtime/gc_trace/TgcConcurrentcardcleaning.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcConcurrentcardcleaning.hpp b/runtime/gc_trace/TgcConcurrentcardcleaning.hpp index 4df3cc17e49..22078a301af 100644 --- a/runtime/gc_trace/TgcConcurrentcardcleaning.hpp +++ b/runtime/gc_trace/TgcConcurrentcardcleaning.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcCopyForward.cpp b/runtime/gc_trace/TgcCopyForward.cpp index 7e3ba4a5cf0..7a127a9b4b7 100644 --- a/runtime/gc_trace/TgcCopyForward.cpp +++ b/runtime/gc_trace/TgcCopyForward.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcCopyForward.hpp b/runtime/gc_trace/TgcCopyForward.hpp index d5c970886b5..7834981c858 100644 --- a/runtime/gc_trace/TgcCopyForward.hpp +++ b/runtime/gc_trace/TgcCopyForward.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcDump.cpp b/runtime/gc_trace/TgcDump.cpp index 36602a26e1e..ab7a902945b 100644 --- a/runtime/gc_trace/TgcDump.cpp +++ b/runtime/gc_trace/TgcDump.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcDump.hpp b/runtime/gc_trace/TgcDump.hpp index 7d01988fa95..b58c601e1e0 100644 --- a/runtime/gc_trace/TgcDump.hpp +++ b/runtime/gc_trace/TgcDump.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcExcessivegc.cpp b/runtime/gc_trace/TgcExcessivegc.cpp index 413ae25da1b..13b33a5d069 100644 --- a/runtime/gc_trace/TgcExcessivegc.cpp +++ b/runtime/gc_trace/TgcExcessivegc.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcExcessivegc.hpp b/runtime/gc_trace/TgcExcessivegc.hpp index b463eae4bc4..f9fcf996a67 100644 --- a/runtime/gc_trace/TgcExcessivegc.hpp +++ b/runtime/gc_trace/TgcExcessivegc.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcExclusiveaccess.cpp b/runtime/gc_trace/TgcExclusiveaccess.cpp index 6fa7467e163..30c7f422b7e 100644 --- a/runtime/gc_trace/TgcExclusiveaccess.cpp +++ b/runtime/gc_trace/TgcExclusiveaccess.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcExclusiveaccess.hpp b/runtime/gc_trace/TgcExclusiveaccess.hpp index 1cd4a1e1cfd..5ece9814ab5 100644 --- a/runtime/gc_trace/TgcExclusiveaccess.hpp +++ b/runtime/gc_trace/TgcExclusiveaccess.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcExtensions.cpp b/runtime/gc_trace/TgcExtensions.cpp index a5b03f0fe82..61e082e690c 100644 --- a/runtime/gc_trace/TgcExtensions.cpp +++ b/runtime/gc_trace/TgcExtensions.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcExtensions.hpp b/runtime/gc_trace/TgcExtensions.hpp index 047f83b6ad1..9f9939e1d1f 100644 --- a/runtime/gc_trace/TgcExtensions.hpp +++ b/runtime/gc_trace/TgcExtensions.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcFreelist.cpp b/runtime/gc_trace/TgcFreelist.cpp index e8ed63184a7..5094799ae29 100644 --- a/runtime/gc_trace/TgcFreelist.cpp +++ b/runtime/gc_trace/TgcFreelist.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcFreelist.hpp b/runtime/gc_trace/TgcFreelist.hpp index 2dddfceb738..9424f565fcc 100644 --- a/runtime/gc_trace/TgcFreelist.hpp +++ b/runtime/gc_trace/TgcFreelist.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TGCFREELIST_HPP_) diff --git a/runtime/gc_trace/TgcHeap.cpp b/runtime/gc_trace/TgcHeap.cpp index bd8aba3e721..a9c364f69b0 100644 --- a/runtime/gc_trace/TgcHeap.cpp +++ b/runtime/gc_trace/TgcHeap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcHeap.hpp b/runtime/gc_trace/TgcHeap.hpp index 53f374da5f8..6971b452d9a 100644 --- a/runtime/gc_trace/TgcHeap.hpp +++ b/runtime/gc_trace/TgcHeap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcNuma.cpp b/runtime/gc_trace/TgcNuma.cpp index c6dc0b64441..cbd8a3190b1 100644 --- a/runtime/gc_trace/TgcNuma.cpp +++ b/runtime/gc_trace/TgcNuma.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcNuma.hpp b/runtime/gc_trace/TgcNuma.hpp index 0b86529af1c..5a083b05b54 100644 --- a/runtime/gc_trace/TgcNuma.hpp +++ b/runtime/gc_trace/TgcNuma.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcParallel.cpp b/runtime/gc_trace/TgcParallel.cpp index f6e2ed58011..22e3a73d495 100644 --- a/runtime/gc_trace/TgcParallel.cpp +++ b/runtime/gc_trace/TgcParallel.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcParallel.hpp b/runtime/gc_trace/TgcParallel.hpp index ad6ee701d9c..7b4eaa1e8c3 100644 --- a/runtime/gc_trace/TgcParallel.hpp +++ b/runtime/gc_trace/TgcParallel.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcRootScanner.cpp b/runtime/gc_trace/TgcRootScanner.cpp index de9dba49296..3749e6df617 100644 --- a/runtime/gc_trace/TgcRootScanner.cpp +++ b/runtime/gc_trace/TgcRootScanner.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcRootScanner.hpp b/runtime/gc_trace/TgcRootScanner.hpp index 128be1b2e31..9d3e6131d21 100644 --- a/runtime/gc_trace/TgcRootScanner.hpp +++ b/runtime/gc_trace/TgcRootScanner.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcScavenger.cpp b/runtime/gc_trace/TgcScavenger.cpp index 4ddc544e67c..eb5d1cdfca4 100644 --- a/runtime/gc_trace/TgcScavenger.cpp +++ b/runtime/gc_trace/TgcScavenger.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcScavenger.hpp b/runtime/gc_trace/TgcScavenger.hpp index 84fed6c04b5..9473e27a4b1 100644 --- a/runtime/gc_trace/TgcScavenger.hpp +++ b/runtime/gc_trace/TgcScavenger.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/TgcTerse.cpp b/runtime/gc_trace/TgcTerse.cpp index 807933e4432..3da2c2cc1ed 100644 --- a/runtime/gc_trace/TgcTerse.cpp +++ b/runtime/gc_trace/TgcTerse.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace/TgcTerse.hpp b/runtime/gc_trace/TgcTerse.hpp index fc47342576c..f1c3f8d6374 100644 --- a/runtime/gc_trace/TgcTerse.hpp +++ b/runtime/gc_trace/TgcTerse.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace/module.xml b/runtime/gc_trace/module.xml index 8e3be76f50d..1c4df607c8d 100644 --- a/runtime/gc_trace/module.xml +++ b/runtime/gc_trace/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_trace_standard/CMakeLists.txt b/runtime/gc_trace_standard/CMakeLists.txt index a1db7fbf788..548490a6ef7 100644 --- a/runtime/gc_trace_standard/CMakeLists.txt +++ b/runtime/gc_trace_standard/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_trace_standard_sources diff --git a/runtime/gc_trace_standard/TgcCompaction.cpp b/runtime/gc_trace_standard/TgcCompaction.cpp index f0f5c70fe5c..cbbc79df514 100644 --- a/runtime/gc_trace_standard/TgcCompaction.cpp +++ b/runtime/gc_trace_standard/TgcCompaction.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_standard/TgcCompaction.hpp b/runtime/gc_trace_standard/TgcCompaction.hpp index 40ee9a9fe29..01fd8181923 100644 --- a/runtime/gc_trace_standard/TgcCompaction.hpp +++ b/runtime/gc_trace_standard/TgcCompaction.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_standard/TgcFreeListSummary.cpp b/runtime/gc_trace_standard/TgcFreeListSummary.cpp index 46cee090c6f..89aaebaa991 100644 --- a/runtime/gc_trace_standard/TgcFreeListSummary.cpp +++ b/runtime/gc_trace_standard/TgcFreeListSummary.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_standard/TgcFreeListSummary.hpp b/runtime/gc_trace_standard/TgcFreeListSummary.hpp index 273bdf4541d..23076b12cea 100644 --- a/runtime/gc_trace_standard/TgcFreeListSummary.hpp +++ b/runtime/gc_trace_standard/TgcFreeListSummary.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_standard/TgcLargeAllocation.cpp b/runtime/gc_trace_standard/TgcLargeAllocation.cpp index 55a4634f5cc..3f1c76274c8 100644 --- a/runtime/gc_trace_standard/TgcLargeAllocation.cpp +++ b/runtime/gc_trace_standard/TgcLargeAllocation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_standard/TgcLargeAllocation.hpp b/runtime/gc_trace_standard/TgcLargeAllocation.hpp index e6d19f9693a..a5fa327715f 100644 --- a/runtime/gc_trace_standard/TgcLargeAllocation.hpp +++ b/runtime/gc_trace_standard/TgcLargeAllocation.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TGCLARGEALLOCATION_HPP_) diff --git a/runtime/gc_trace_standard/module.xml b/runtime/gc_trace_standard/module.xml index 5caa7c1e252..19438f478a7 100644 --- a/runtime/gc_trace_standard/module.xml +++ b/runtime/gc_trace_standard/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_trace_vlhgc/CMakeLists.txt b/runtime/gc_trace_vlhgc/CMakeLists.txt index c505142c3cb..28f7528b43e 100644 --- a/runtime/gc_trace_vlhgc/CMakeLists.txt +++ b/runtime/gc_trace_vlhgc/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_trace_vlhgc_sources diff --git a/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.cpp b/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.cpp index 369ad470321..4b8fc3c1788 100644 --- a/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.cpp +++ b/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.hpp b/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.hpp index 83e7dbbc017..77077094f3e 100644 --- a/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.hpp +++ b/runtime/gc_trace_vlhgc/TgcDynamicCollectionSet.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcIntelligentCompact.cpp b/runtime/gc_trace_vlhgc/TgcIntelligentCompact.cpp index abf23a54053..9bccc0f1e94 100644 --- a/runtime/gc_trace_vlhgc/TgcIntelligentCompact.cpp +++ b/runtime/gc_trace_vlhgc/TgcIntelligentCompact.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcIntelligentCompact.hpp b/runtime/gc_trace_vlhgc/TgcIntelligentCompact.hpp index 27708732568..7dc62ce0965 100644 --- a/runtime/gc_trace_vlhgc/TgcIntelligentCompact.hpp +++ b/runtime/gc_trace_vlhgc/TgcIntelligentCompact.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcInterRegionReferences.cpp b/runtime/gc_trace_vlhgc/TgcInterRegionReferences.cpp index 354088d6776..11b0a3cbdc6 100644 --- a/runtime/gc_trace_vlhgc/TgcInterRegionReferences.cpp +++ b/runtime/gc_trace_vlhgc/TgcInterRegionReferences.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcInterRegionReferences.hpp b/runtime/gc_trace_vlhgc/TgcInterRegionReferences.hpp index 6f2354ea5e1..a6d30d1f735 100644 --- a/runtime/gc_trace_vlhgc/TgcInterRegionReferences.hpp +++ b/runtime/gc_trace_vlhgc/TgcInterRegionReferences.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.cpp b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.cpp index b18149df2d6..401834ac49e 100644 --- a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.cpp +++ b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.hpp b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.hpp index a890d6f4c97..70e39f6468d 100644 --- a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.hpp +++ b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSet.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.cpp b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.cpp index 85e8c904933..2dc0019bea0 100644 --- a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.cpp +++ b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.hpp b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.hpp index 3aa6cf6b86c..7c0503062ab 100644 --- a/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.hpp +++ b/runtime/gc_trace_vlhgc/TgcInterRegionRememberedSetDemographics.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcProjectedStats.cpp b/runtime/gc_trace_vlhgc/TgcProjectedStats.cpp index 57038619e3f..285e6ce6293 100644 --- a/runtime/gc_trace_vlhgc/TgcProjectedStats.cpp +++ b/runtime/gc_trace_vlhgc/TgcProjectedStats.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcProjectedStats.hpp b/runtime/gc_trace_vlhgc/TgcProjectedStats.hpp index 74ea56e9071..8ed84eb1b3d 100644 --- a/runtime/gc_trace_vlhgc/TgcProjectedStats.hpp +++ b/runtime/gc_trace_vlhgc/TgcProjectedStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.cpp b/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.cpp index 2026f5f3749..8a9ee3d2e51 100644 --- a/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.cpp +++ b/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.hpp b/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.hpp index ff4704d0d59..2b4e76b3cbc 100644 --- a/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.hpp +++ b/runtime/gc_trace_vlhgc/TgcWriteOnceCompactTiming.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.cpp b/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.cpp index 73c58e7b1a4..8b14f8a054d 100644 --- a/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.cpp +++ b/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.hpp b/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.hpp index 04c8edac4b4..df843b660b6 100644 --- a/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.hpp +++ b/runtime/gc_trace_vlhgc/TgcWriteOnceCompaction.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_trace_vlhgc/module.xml b/runtime/gc_trace_vlhgc/module.xml index 4e1b004e63a..d20d5133e5c 100644 --- a/runtime/gc_trace_vlhgc/module.xml +++ b/runtime/gc_trace_vlhgc/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_verbose_handler_realtime/CMakeLists.txt b/runtime/gc_verbose_handler_realtime/CMakeLists.txt index 6562d2c210c..31037861860 100644 --- a/runtime/gc_verbose_handler_realtime/CMakeLists.txt +++ b/runtime/gc_verbose_handler_realtime/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_verbose_handler_realtime_sources diff --git a/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.cpp b/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.cpp index 3aed28159c1..c2b8b2e032b 100644 --- a/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.cpp +++ b/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseHandlerOutputRealtime.hpp" diff --git a/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.hpp b/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.hpp index 2a67233509c..ac1b12efb4e 100644 --- a/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.hpp +++ b/runtime/gc_verbose_handler_realtime/VerboseHandlerOutputRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSEHANDLEROUTPUTREALTIME_HPP_) diff --git a/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.cpp b/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.cpp index affdfc7a100..349bdd3256a 100644 --- a/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.cpp +++ b/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Temporary file to make compilers happy */ diff --git a/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.hpp b/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.hpp index 443421c80c0..bc5b9b3ae9f 100644 --- a/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.hpp +++ b/runtime/gc_verbose_handler_realtime/VerboseHandlerRealtime.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VERBOSEHANDLERREALTIME_HPP_ diff --git a/runtime/gc_verbose_handler_realtime/module.xml b/runtime/gc_verbose_handler_realtime/module.xml index aa2cdecfaca..6df97fe3938 100644 --- a/runtime/gc_verbose_handler_realtime/module.xml +++ b/runtime/gc_verbose_handler_realtime/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_verbose_handler_standard_java/CMakeLists.txt b/runtime/gc_verbose_handler_standard_java/CMakeLists.txt index 2749dedbf8d..79aa572a658 100644 --- a/runtime/gc_verbose_handler_standard_java/CMakeLists.txt +++ b/runtime/gc_verbose_handler_standard_java/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_verbose_handler_standard_java_sources diff --git a/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.cpp b/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.cpp index 0b6986511d9..57303d9f099 100644 --- a/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.cpp +++ b/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9modron.h" diff --git a/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.hpp b/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.hpp index f9cce5ea7a3..21da26c7dff 100644 --- a/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.hpp +++ b/runtime/gc_verbose_handler_standard_java/VerboseHandlerOutputStandardJava.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSEHANDLEROUTPUTSTANDARDJAVA_HPP_) diff --git a/runtime/gc_verbose_handler_standard_java/module.xml b/runtime/gc_verbose_handler_standard_java/module.xml index ddb52229f7f..bd666b4d686 100644 --- a/runtime/gc_verbose_handler_standard_java/module.xml +++ b/runtime/gc_verbose_handler_standard_java/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_verbose_handler_vlhgc/CMakeLists.txt b/runtime/gc_verbose_handler_vlhgc/CMakeLists.txt index d3e5e405edd..6a7883f3d9d 100644 --- a/runtime/gc_verbose_handler_vlhgc/CMakeLists.txt +++ b/runtime/gc_verbose_handler_vlhgc/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_verbose_handler_vlhgc_sources diff --git a/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.cpp b/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.cpp index e2703afcfc6..8c91ae54ed0 100644 --- a/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.cpp +++ b/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseHandlerOutputVLHGC.hpp" diff --git a/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.hpp b/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.hpp index 934b383843c..b86c74507ef 100644 --- a/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.hpp +++ b/runtime/gc_verbose_handler_vlhgc/VerboseHandlerOutputVLHGC.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSEHANDLEROUTPUTVLHGC_HPP_) diff --git a/runtime/gc_verbose_handler_vlhgc/VerboseHandlerPlaceholder_vlhgc.cpp b/runtime/gc_verbose_handler_vlhgc/VerboseHandlerPlaceholder_vlhgc.cpp index 35aec321311..26486bf94a0 100644 --- a/runtime/gc_verbose_handler_vlhgc/VerboseHandlerPlaceholder_vlhgc.cpp +++ b/runtime/gc_verbose_handler_vlhgc/VerboseHandlerPlaceholder_vlhgc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Temporary file to make compilers happy */ diff --git a/runtime/gc_verbose_handler_vlhgc/module.xml b/runtime/gc_verbose_handler_vlhgc/module.xml index 77a4af7af9d..0e018e4bf5b 100644 --- a/runtime/gc_verbose_handler_vlhgc/module.xml +++ b/runtime/gc_verbose_handler_vlhgc/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_verbose_java/CMakeLists.txt b/runtime/gc_verbose_java/CMakeLists.txt index 2440059f517..3d3d420556f 100644 --- a/runtime/gc_verbose_java/CMakeLists.txt +++ b/runtime/gc_verbose_java/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_verbose_java_sources diff --git a/runtime/gc_verbose_java/VerboseHandlerJava.cpp b/runtime/gc_verbose_java/VerboseHandlerJava.cpp index 15be0804a7e..f35ddf1ebe4 100644 --- a/runtime/gc_verbose_java/VerboseHandlerJava.cpp +++ b/runtime/gc_verbose_java/VerboseHandlerJava.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Temporary file to make compilers happy */ diff --git a/runtime/gc_verbose_java/VerboseHandlerJava.hpp b/runtime/gc_verbose_java/VerboseHandlerJava.hpp index 2c54dc8a84c..b2cd110d927 100644 --- a/runtime/gc_verbose_java/VerboseHandlerJava.hpp +++ b/runtime/gc_verbose_java/VerboseHandlerJava.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VERBOSEHANDLERJAVA_HPP_ diff --git a/runtime/gc_verbose_java/VerboseJava.cpp b/runtime/gc_verbose_java/VerboseJava.cpp index 488324dc7ec..3e64c7ba17e 100644 --- a/runtime/gc_verbose_java/VerboseJava.cpp +++ b/runtime/gc_verbose_java/VerboseJava.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "j9cfg.h" diff --git a/runtime/gc_verbose_java/VerboseManagerJava.cpp b/runtime/gc_verbose_java/VerboseManagerJava.cpp index c20435faad3..fde1b2ee5c3 100644 --- a/runtime/gc_verbose_java/VerboseManagerJava.cpp +++ b/runtime/gc_verbose_java/VerboseManagerJava.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gcutils.h" diff --git a/runtime/gc_verbose_java/VerboseManagerJava.hpp b/runtime/gc_verbose_java/VerboseManagerJava.hpp index 2391908fc39..96ffccf2f51 100644 --- a/runtime/gc_verbose_java/VerboseManagerJava.hpp +++ b/runtime/gc_verbose_java/VerboseManagerJava.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSEMANAGERJAVA_HPP_) diff --git a/runtime/gc_verbose_java/VerboseWriterTrace.cpp b/runtime/gc_verbose_java/VerboseWriterTrace.cpp index 0a0f898db8c..c3f49c480fa 100644 --- a/runtime/gc_verbose_java/VerboseWriterTrace.cpp +++ b/runtime/gc_verbose_java/VerboseWriterTrace.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* TODO (stefanbu) Tracing story unavailable for OMR, this file should be moved back to verbose */ diff --git a/runtime/gc_verbose_java/VerboseWriterTrace.hpp b/runtime/gc_verbose_java/VerboseWriterTrace.hpp index 429c94ff52c..32eab95d0c8 100644 --- a/runtime/gc_verbose_java/VerboseWriterTrace.hpp +++ b/runtime/gc_verbose_java/VerboseWriterTrace.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* TODO (stefanbu) Tracing story unavailable for OMR, this file should be moved back to verbose */ diff --git a/runtime/gc_verbose_java/module.xml b/runtime/gc_verbose_java/module.xml index 58308e58a93..692ce90961e 100644 --- a/runtime/gc_verbose_java/module.xml +++ b/runtime/gc_verbose_java/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_verbose_old/CMakeLists.txt b/runtime/gc_verbose_old/CMakeLists.txt index 68e329f3980..7d5ca03debf 100644 --- a/runtime/gc_verbose_old/CMakeLists.txt +++ b/runtime/gc_verbose_old/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_verbose_old_sources diff --git a/runtime/gc_verbose_old/VerboseEventStream.cpp b/runtime/gc_verbose_old/VerboseEventStream.cpp index db0ed7d3bb9..dd777bd84a3 100644 --- a/runtime/gc_verbose_old/VerboseEventStream.cpp +++ b/runtime/gc_verbose_old/VerboseEventStream.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicOperations.hpp" diff --git a/runtime/gc_verbose_old/VerboseEventStream.hpp b/runtime/gc_verbose_old/VerboseEventStream.hpp index 5df408c6fc0..69aa8ab6e20 100644 --- a/runtime/gc_verbose_old/VerboseEventStream.hpp +++ b/runtime/gc_verbose_old/VerboseEventStream.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENTSTREAM_HPP_) diff --git a/runtime/gc_verbose_old/VerboseFileLoggingOutput.cpp b/runtime/gc_verbose_old/VerboseFileLoggingOutput.cpp index 733120126aa..bd1acb6a762 100644 --- a/runtime/gc_verbose_old/VerboseFileLoggingOutput.cpp +++ b/runtime/gc_verbose_old/VerboseFileLoggingOutput.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "modronnls.h" diff --git a/runtime/gc_verbose_old/VerboseFileLoggingOutput.hpp b/runtime/gc_verbose_old/VerboseFileLoggingOutput.hpp index 12bc599de8e..e4bc9644fc3 100644 --- a/runtime/gc_verbose_old/VerboseFileLoggingOutput.hpp +++ b/runtime/gc_verbose_old/VerboseFileLoggingOutput.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(FILE_LOG_OUTPUT_HPP_) diff --git a/runtime/gc_verbose_old/VerboseManagerOld.cpp b/runtime/gc_verbose_old/VerboseManagerOld.cpp index 6d6a75d5fa1..c42bb9cf315 100644 --- a/runtime/gc_verbose_old/VerboseManagerOld.cpp +++ b/runtime/gc_verbose_old/VerboseManagerOld.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gcutils.h" diff --git a/runtime/gc_verbose_old/VerboseManagerOld.hpp b/runtime/gc_verbose_old/VerboseManagerOld.hpp index 29d18620302..b3554327da6 100644 --- a/runtime/gc_verbose_old/VerboseManagerOld.hpp +++ b/runtime/gc_verbose_old/VerboseManagerOld.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSEMANAGEROLD_HPP_) diff --git a/runtime/gc_verbose_old/VerboseOutputAgent.cpp b/runtime/gc_verbose_old/VerboseOutputAgent.cpp index 33028c4fcb7..b8dcade6260 100644 --- a/runtime/gc_verbose_old/VerboseOutputAgent.cpp +++ b/runtime/gc_verbose_old/VerboseOutputAgent.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "GCExtensions.hpp" diff --git a/runtime/gc_verbose_old/VerboseOutputAgent.hpp b/runtime/gc_verbose_old/VerboseOutputAgent.hpp index 2eb6e3354a5..1433e0fab96 100644 --- a/runtime/gc_verbose_old/VerboseOutputAgent.hpp +++ b/runtime/gc_verbose_old/VerboseOutputAgent.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(_OUTPUT_AGENT_HPP_) diff --git a/runtime/gc_verbose_old/VerboseStandardStreamOutput.cpp b/runtime/gc_verbose_old/VerboseStandardStreamOutput.cpp index 3a45631efb4..7a7d763ab3e 100644 --- a/runtime/gc_verbose_old/VerboseStandardStreamOutput.cpp +++ b/runtime/gc_verbose_old/VerboseStandardStreamOutput.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseStandardStreamOutput.hpp" diff --git a/runtime/gc_verbose_old/VerboseStandardStreamOutput.hpp b/runtime/gc_verbose_old/VerboseStandardStreamOutput.hpp index 31fae321057..920f892632a 100644 --- a/runtime/gc_verbose_old/VerboseStandardStreamOutput.hpp +++ b/runtime/gc_verbose_old/VerboseStandardStreamOutput.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(STD_STREAM_OUTPUT_HPP_) diff --git a/runtime/gc_verbose_old/VerboseTraceOutput.cpp b/runtime/gc_verbose_old/VerboseTraceOutput.cpp index 414f73c54bc..b47d67351b4 100644 --- a/runtime/gc_verbose_old/VerboseTraceOutput.cpp +++ b/runtime/gc_verbose_old/VerboseTraceOutput.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_verbose_old/VerboseTraceOutput.hpp b/runtime/gc_verbose_old/VerboseTraceOutput.hpp index 893ea6d68a0..c2bd87dc76d 100644 --- a/runtime/gc_verbose_old/VerboseTraceOutput.hpp +++ b/runtime/gc_verbose_old/VerboseTraceOutput.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TRACE_OUTPUT_HPP_) diff --git a/runtime/gc_verbose_old/module.xml b/runtime/gc_verbose_old/module.xml index 5d64d541579..74efa7faca9 100644 --- a/runtime/gc_verbose_old/module.xml +++ b/runtime/gc_verbose_old/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_verbose_old_events/CMakeLists.txt b/runtime/gc_verbose_old_events/CMakeLists.txt index b66d213c48c..6519935955e 100644 --- a/runtime/gc_verbose_old_events/CMakeLists.txt +++ b/runtime/gc_verbose_old_events/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_verbose_old_events_sources diff --git a/runtime/gc_verbose_old_events/VerboseEvent.cpp b/runtime/gc_verbose_old_events/VerboseEvent.cpp index 77f3097956d..6dc407863f8 100644 --- a/runtime/gc_verbose_old_events/VerboseEvent.cpp +++ b/runtime/gc_verbose_old_events/VerboseEvent.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEvent.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEvent.hpp b/runtime/gc_verbose_old_events/VerboseEvent.hpp index 3d482edc479..c46cd7a9087 100644 --- a/runtime/gc_verbose_old_events/VerboseEvent.hpp +++ b/runtime/gc_verbose_old_events/VerboseEvent.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VERBOSE_EVENT_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventAFEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventAFEnd.cpp index d170a7e1e8e..de701eb9357 100644 --- a/runtime/gc_verbose_old_events/VerboseEventAFEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventAFEnd.cpp @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventAFEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventAFEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventAFEnd.hpp index 7c40a1d98ba..555aed90d7d 100644 --- a/runtime/gc_verbose_old_events/VerboseEventAFEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventAFEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_AF_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventAFStart.cpp b/runtime/gc_verbose_old_events/VerboseEventAFStart.cpp index 7ca82284e54..569017a290c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventAFStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventAFStart.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventAFStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventAFStart.hpp b/runtime/gc_verbose_old_events/VerboseEventAFStart.hpp index bac3dec4610..70d5a4d0bca 100644 --- a/runtime/gc_verbose_old_events/VerboseEventAFStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventAFStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_AF_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.cpp index 0a997c4a0d6..1c5be223e0e 100644 --- a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventClassUnloadingEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.hpp index 1d7f5bfd661..e3b1a7861f2 100644 --- a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CLASS_UNLOADING_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.cpp b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.cpp index ab02628772b..6c63e909188 100644 --- a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventClassUnloadingStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.hpp b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.hpp index 714fcddc10b..76c6626961e 100644 --- a/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventClassUnloadingStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CLASS_UNLOADING_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventCompactEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventCompactEnd.cpp index 0858af68a31..2d5f2ce9c8a 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCompactEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventCompactEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventCompactEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventCompactEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventCompactEnd.hpp index b5972737e50..751573d179b 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCompactEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventCompactEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_COMPACT_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventCompactStart.cpp b/runtime/gc_verbose_old_events/VerboseEventCompactStart.cpp index 9ac27f2a6e9..c1e4d2535b3 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCompactStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventCompactStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventCompactStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventCompactStart.hpp b/runtime/gc_verbose_old_events/VerboseEventCompactStart.hpp index 8553b666c6f..58fb9bc7b5c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCompactStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventCompactStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_COMPACT_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.cpp b/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.cpp index 98a64e3cc78..e820b1d0d00 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.hpp b/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.hpp index 0cdd5f4acee..db65d2d75ec 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventCompletedConcurrentSweep.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_COMPLETED_CONCURRENT_SWEEP_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.cpp index f8dd691f3ec..155c5a3ee2c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9modron.h" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.hpp index 2d88a93ef70..e115110137c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentAborted.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_ABORTED_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.cpp index 8b4e1ab0e2f..0ac24714acc 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentCompleteTracingEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.hpp index 7a73e6843d7..6b34e85a830 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_COMPLETE_TRACING_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.cpp index 6880141f8fc..15fe8ce1bf9 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentCompleteTracingStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.hpp index 8e75a580799..ffbb280d828 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentCompleteTracingStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_COMPLETE_TRACING_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.cpp index daa4ce11999..4015545ec71 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.hpp index 30d05b786ff..6fdf9e2b475 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.cpp index 85e78b915c4..d4de06c12b0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentFinalCardCleaningEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.hpp index 528532bbdfa..bfa1f82d55d 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_FCC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.cpp index 4a716dad60f..c5f6207c301 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentFinalCardCleaningStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.hpp index 7b41e64db58..05fb034efa7 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentFinalCardCleaningStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_FCC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.cpp index dc11d731176..4d9980530b1 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ConcurrentGCStats.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.hpp index 230c9dc5a58..31dc1e6d238 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentHalted.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_HALTED_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.cpp index 505351bd79c..33374594eb2 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9modron.h" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.hpp index 2aad9de3888..0025777960c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentKickOff.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_KICKOFF_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.cpp index 5db70b66de7..6107636785a 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentRSScanEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.hpp index 807186da73f..95f65ed3b9b 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_RS_SCAN_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.cpp index bf0c4ed33a5..91a68755764 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentRSScanStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.hpp index b6299447fa4..1327c57c737 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentRSScanStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_RS_SCAN_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.cpp index 4b4520949b9..73d995eb2bf 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventConcurrentStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.hpp index d7f57e3018e..fa4ec09cf02 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CON_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.cpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.cpp index e97dcc76c40..0b6f0870620 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.hpp b/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.hpp index d1d05320521..fc3e7ccd6b4 100644 --- a/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventConcurrentlyCompletedSweepPhase.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_CONCURRENTLY_COMPLETED_SWEEP_PHASE_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.cpp b/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.cpp index ce7d02672f3..4017d4e51e0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventCopyForwardAbortRaised.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.hpp b/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.hpp index 8a4f14d35fc..0799d8fe339 100644 --- a/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventCopyForwardAbortRaised.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_COPYFORWARDABORTRAISED_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.cpp b/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.cpp index febe99f49fc..1daa75499d9 100644 --- a/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventExcessiveGCRaised.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.hpp b/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.hpp index fa3ebb82918..88f44d6220a 100644 --- a/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventExcessiveGCRaised.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_EXCESSIVEGCRAISED_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventGCEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventGCEnd.cpp index f1f29e1ac11..a3aaff70f3e 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGCEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventGCEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventGCEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventGCEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventGCEnd.hpp index 18781a0e204..b52e4a394b8 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGCEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventGCEnd.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_GC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventGCInitialized.cpp b/runtime/gc_verbose_old_events/VerboseEventGCInitialized.cpp index ae70a5fa2ff..6cbdcd1b727 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGCInitialized.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventGCInitialized.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventGCInitialized.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventGCInitialized.hpp b/runtime/gc_verbose_old_events/VerboseEventGCInitialized.hpp index 6a39f5255a4..9d0c9778a0c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGCInitialized.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventGCInitialized.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_GCINITIALIZED_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventGCStart.cpp b/runtime/gc_verbose_old_events/VerboseEventGCStart.cpp index e8b7e31ab0c..a10797bda64 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGCStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventGCStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventGCStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventGCStart.hpp b/runtime/gc_verbose_old_events/VerboseEventGCStart.hpp index ded64f73a32..19fbbbf9395 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGCStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventGCStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_GC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.cpp index 9cbc7ae4337..f4c3d694186 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventGlobalGCEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.hpp index ef10759bf7d..8a975766796 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventGlobalGCEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_GLOBAL_GC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.cpp b/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.cpp index 29b8cecab5d..05a327fd859 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventGlobalGCStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.hpp b/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.hpp index c27afc69446..fd4fe0088f0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventGlobalGCStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_GLOBAL_GC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventHeapResize.cpp b/runtime/gc_verbose_old_events/VerboseEventHeapResize.cpp index 1a7c635a923..c1ce7a93088 100644 --- a/runtime/gc_verbose_old_events/VerboseEventHeapResize.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventHeapResize.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventHeapResize.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventHeapResize.hpp b/runtime/gc_verbose_old_events/VerboseEventHeapResize.hpp index ac3834d782a..3de2d4c3a95 100644 --- a/runtime/gc_verbose_old_events/VerboseEventHeapResize.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventHeapResize.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_HEAP_RESIZE_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.cpp index 4058182c101..0f295ecc9a3 100644 --- a/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventLocalGCEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.hpp index 7f3a83fbbea..66905a85010 100644 --- a/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventLocalGCEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_LOCAL_GC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.cpp b/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.cpp index a047b187f31..24f87195ba6 100644 --- a/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventLocalGCStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.hpp b/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.hpp index 395d5a655c6..f2bad1b2f83 100644 --- a/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventLocalGCStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_LOCAL_GC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMarkEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventMarkEnd.cpp index b9145c32ba3..43a03f43289 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMarkEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMarkEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMarkEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMarkEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventMarkEnd.hpp index df73722834c..cea9bdf4d2d 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMarkEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMarkEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_MARK_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMarkStart.cpp b/runtime/gc_verbose_old_events/VerboseEventMarkStart.cpp index 3e3a79603fd..071838452f2 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMarkStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMarkStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMarkStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMarkStart.hpp b/runtime/gc_verbose_old_events/VerboseEventMarkStart.hpp index 934b340982b..1c9ce54e680 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMarkStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMarkStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_MARK_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.cpp index 5a837ad5053..6fb7716b782 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeCycleEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.hpp index 91c1ffaa438..ccd2b6b4cb0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_CYCLE_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.cpp index 7d5b2175fbb..d80840e402c 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeCycleStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.hpp index 72fa0fbe0ea..a9dad37cd67 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeCycleStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_CYCLE_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.cpp index a554477a059..f56ff855443 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeGCEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.hpp index a348dfab828..7efd0b6bfa0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_GC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.cpp index 3a239e9dc13..7574ec437e0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeGCStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.hpp index 533d60ef5da..07c69700602 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeGCStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_GC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.cpp index 643a5b09024..2e44b5030a7 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeNonMonotonicTime.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.hpp index fafbcb312d3..a09cc9540dd 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeNonMonotonicTime.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_NON_MONOTONIC_TIME_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.cpp index 7925b88bb0c..21bdb481513 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeOutOfMemory.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.hpp index 6173ea4f3e1..f5bf5bc7ec0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeOutOfMemory.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_OUT_OF_MEMORY_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.cpp index 7722a75dd9b..25bee0579f0 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeSynchronousGCEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.hpp index 8162c1c7dbb..e09b47f29d5 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCEnd.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME__SYNCHRONOUS_GC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.cpp index 185acfd7464..a521e846935 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeSynchronousGCStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.hpp index d753c2319f3..c40a0785883 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeSynchronousGCStart.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME__SYNCHRONOUS_GC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.cpp index 2d65fe65e34..69ad5aa82f3 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeTriggerEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.hpp index 3b21f0810d7..265db8509bb 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME__TRIGGER_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.cpp index d9ab27fda7e..9297aa4744e 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeTriggerStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.hpp index 1610c3aba55..83798cab1d9 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeTriggerStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME__TRIGGER_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.cpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.cpp index ef545e2f87b..c0b943cb373 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventMetronomeUtilizationTrackerOverflow.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.hpp b/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.hpp index 90a4e95c163..3644944b189 100644 --- a/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventMetronomeUtilizationTrackerOverflow.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_METRONOME_UTILIZATION_TRACKER_OVERFLOW_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.cpp b/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.cpp index 2b919117554..ebeb545eb96 100644 --- a/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "gcutils.h" diff --git a/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.hpp b/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.hpp index c96981616c0..74a6f495b98 100644 --- a/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventPercolateCollect.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_PERCOLATE_COLLECT_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventSweepEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventSweepEnd.cpp index b7f59cbb82d..71f540811c8 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSweepEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventSweepEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventSweepEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventSweepEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventSweepEnd.hpp index 33ee971c075..346274290c8 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSweepEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventSweepEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_SWEEP_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventSweepStart.cpp b/runtime/gc_verbose_old_events/VerboseEventSweepStart.cpp index aa5036c97d6..d3094613ef1 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSweepStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventSweepStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventSweepStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventSweepStart.hpp b/runtime/gc_verbose_old_events/VerboseEventSweepStart.hpp index e299395960f..260070598a5 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSweepStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventSweepStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_SWEEP_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.cpp index 3d2649ece77..f9af3f23828 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventSystemGCEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.hpp index c6dc3232db3..1116bcc0169 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventSystemGCEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_SYSTEM_GC_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.cpp b/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.cpp index d5ab9726ce6..62f0f067978 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventSystemGCStart.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.hpp b/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.hpp index d4c8565bcbf..c7389c72f94 100644 --- a/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventSystemGCStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_SYSTEM_GC_START_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.cpp b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.cpp index b343d110416..c5104492f24 100644 --- a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.cpp @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventTarokIncrementEnd.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.hpp b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.hpp index bbdeca48488..b6c2afb75e4 100644 --- a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementEnd.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_TAROK_INCREMENT_END_HPP_) diff --git a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.cpp b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.cpp index 8a2938193f7..929208b0caf 100644 --- a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.cpp +++ b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VerboseEventTarokIncrementStart.hpp" #include "VerboseEventStream.hpp" diff --git a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.hpp b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.hpp index e7d47916fcf..8a9caa887c6 100644 --- a/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.hpp +++ b/runtime/gc_verbose_old_events/VerboseEventTarokIncrementStart.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(EVENT_TAROK_INCREMENT_START_HPP_) diff --git a/runtime/gc_verbose_old_events/module.xml b/runtime/gc_verbose_old_events/module.xml index dd42e5488ca..2853b62066b 100644 --- a/runtime/gc_verbose_old_events/module.xml +++ b/runtime/gc_verbose_old_events/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gc_vlhgc/AllocationContextBalanced.cpp b/runtime/gc_vlhgc/AllocationContextBalanced.cpp index 542c75ca657..314742988a0 100644 --- a/runtime/gc_vlhgc/AllocationContextBalanced.cpp +++ b/runtime/gc_vlhgc/AllocationContextBalanced.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/AllocationContextBalanced.hpp b/runtime/gc_vlhgc/AllocationContextBalanced.hpp index 36f5b5ac0aa..4c01232d3c8 100644 --- a/runtime/gc_vlhgc/AllocationContextBalanced.hpp +++ b/runtime/gc_vlhgc/AllocationContextBalanced.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/AllocationContextTarok.cpp b/runtime/gc_vlhgc/AllocationContextTarok.cpp index eb333243fa8..065833342ca 100644 --- a/runtime/gc_vlhgc/AllocationContextTarok.cpp +++ b/runtime/gc_vlhgc/AllocationContextTarok.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/AllocationContextTarok.hpp b/runtime/gc_vlhgc/AllocationContextTarok.hpp index d5b06b5f322..c7b0053aeaf 100644 --- a/runtime/gc_vlhgc/AllocationContextTarok.hpp +++ b/runtime/gc_vlhgc/AllocationContextTarok.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CMakeLists.txt b/runtime/gc_vlhgc/CMakeLists.txt index f469d68e4d9..44fa0d15144 100644 --- a/runtime/gc_vlhgc/CMakeLists.txt +++ b/runtime/gc_vlhgc/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gc_vlhgc_sources diff --git a/runtime/gc_vlhgc/CardListFlushTask.cpp b/runtime/gc_vlhgc/CardListFlushTask.cpp index a729b1b2a90..00ee02eddd6 100644 --- a/runtime/gc_vlhgc/CardListFlushTask.cpp +++ b/runtime/gc_vlhgc/CardListFlushTask.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/CardListFlushTask.hpp b/runtime/gc_vlhgc/CardListFlushTask.hpp index 3d47a4fe348..b6ec2e3aa30 100644 --- a/runtime/gc_vlhgc/CardListFlushTask.hpp +++ b/runtime/gc_vlhgc/CardListFlushTask.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ClassLoaderRememberedSet.cpp b/runtime/gc_vlhgc/ClassLoaderRememberedSet.cpp index 67a34450503..9b8b24daa52 100644 --- a/runtime/gc_vlhgc/ClassLoaderRememberedSet.cpp +++ b/runtime/gc_vlhgc/ClassLoaderRememberedSet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/gc_vlhgc/ClassLoaderRememberedSet.hpp b/runtime/gc_vlhgc/ClassLoaderRememberedSet.hpp index 8470a79ec11..d8e9cc9de78 100644 --- a/runtime/gc_vlhgc/ClassLoaderRememberedSet.hpp +++ b/runtime/gc_vlhgc/ClassLoaderRememberedSet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CollectionSetDelegate.cpp b/runtime/gc_vlhgc/CollectionSetDelegate.cpp index 18c60585eee..5f747db1c88 100644 --- a/runtime/gc_vlhgc/CollectionSetDelegate.cpp +++ b/runtime/gc_vlhgc/CollectionSetDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CollectionSetDelegate.hpp b/runtime/gc_vlhgc/CollectionSetDelegate.hpp index 6fc1417f918..6969d77bb4f 100644 --- a/runtime/gc_vlhgc/CollectionSetDelegate.hpp +++ b/runtime/gc_vlhgc/CollectionSetDelegate.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CompactGroupManager.cpp b/runtime/gc_vlhgc/CompactGroupManager.cpp index 09920471025..5490ced0e6d 100644 --- a/runtime/gc_vlhgc/CompactGroupManager.cpp +++ b/runtime/gc_vlhgc/CompactGroupManager.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CompactGroupManager.hpp b/runtime/gc_vlhgc/CompactGroupManager.hpp index d6dfa2147c5..1a2836bb57c 100644 --- a/runtime/gc_vlhgc/CompactGroupManager.hpp +++ b/runtime/gc_vlhgc/CompactGroupManager.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CompactGroupPersistentStats.cpp b/runtime/gc_vlhgc/CompactGroupPersistentStats.cpp index a34ac0ced6d..f719e86c89f 100644 --- a/runtime/gc_vlhgc/CompactGroupPersistentStats.cpp +++ b/runtime/gc_vlhgc/CompactGroupPersistentStats.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/gc_vlhgc/CompactGroupPersistentStats.hpp b/runtime/gc_vlhgc/CompactGroupPersistentStats.hpp index 5838fcfb6b8..2c1e831c8f1 100644 --- a/runtime/gc_vlhgc/CompactGroupPersistentStats.hpp +++ b/runtime/gc_vlhgc/CompactGroupPersistentStats.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CompressedCardTable.cpp b/runtime/gc_vlhgc/CompressedCardTable.cpp index 939f678d840..32c6a94f374 100644 --- a/runtime/gc_vlhgc/CompressedCardTable.cpp +++ b/runtime/gc_vlhgc/CompressedCardTable.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CompressedCardTable.hpp b/runtime/gc_vlhgc/CompressedCardTable.hpp index 3c6edb6349b..65812ccf4a4 100644 --- a/runtime/gc_vlhgc/CompressedCardTable.hpp +++ b/runtime/gc_vlhgc/CompressedCardTable.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.cpp b/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.cpp index 363d597ab2e..67bf9e241ee 100644 --- a/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.cpp +++ b/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.hpp b/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.hpp index 0cc48f081d2..32cd28f9cf1 100644 --- a/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.hpp +++ b/runtime/gc_vlhgc/ConfigurationIncrementalGenerational.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.cpp b/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.cpp index 184fd4b6697..85d969b549e 100644 --- a/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.cpp +++ b/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.hpp b/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.hpp index aa2ef72e6b5..ad1a8cd407b 100644 --- a/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.hpp +++ b/runtime/gc_vlhgc/ContinuationObjectBufferVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CONTINUATIONOBJECTBUFFERVLHGC_HPP_ diff --git a/runtime/gc_vlhgc/CopyForwardCompactGroup.hpp b/runtime/gc_vlhgc/CopyForwardCompactGroup.hpp index 00232e8fc3b..97679441b44 100644 --- a/runtime/gc_vlhgc/CopyForwardCompactGroup.hpp +++ b/runtime/gc_vlhgc/CopyForwardCompactGroup.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CopyForwardDelegate.cpp b/runtime/gc_vlhgc/CopyForwardDelegate.cpp index 0b66cf68d3d..5b60591cef2 100644 --- a/runtime/gc_vlhgc/CopyForwardDelegate.cpp +++ b/runtime/gc_vlhgc/CopyForwardDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyForwardDelegate.hpp b/runtime/gc_vlhgc/CopyForwardDelegate.hpp index 5616b171703..9e1ad9d15f3 100644 --- a/runtime/gc_vlhgc/CopyForwardDelegate.hpp +++ b/runtime/gc_vlhgc/CopyForwardDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.cpp b/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.cpp index 671daa997db..abd16e9c39a 100644 --- a/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.cpp +++ b/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.hpp b/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.hpp index e72bde98ea5..1b1245cc4be 100644 --- a/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.hpp +++ b/runtime/gc_vlhgc/CopyForwardGMPCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.cpp b/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.cpp index d2382093608..8688b587492 100644 --- a/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.cpp +++ b/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.hpp b/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.hpp index 423b280e5d2..49bab7ae9a8 100644 --- a/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.hpp +++ b/runtime/gc_vlhgc/CopyForwardNoGMPCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/CopyForwardScheme.cpp b/runtime/gc_vlhgc/CopyForwardScheme.cpp index 54d11d1eb1f..5870be8fbcd 100644 --- a/runtime/gc_vlhgc/CopyForwardScheme.cpp +++ b/runtime/gc_vlhgc/CopyForwardScheme.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyForwardScheme.hpp b/runtime/gc_vlhgc/CopyForwardScheme.hpp index 321266f9682..870aaca0a94 100644 --- a/runtime/gc_vlhgc/CopyForwardScheme.hpp +++ b/runtime/gc_vlhgc/CopyForwardScheme.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CopyForwardSchemeTask.cpp b/runtime/gc_vlhgc/CopyForwardSchemeTask.cpp index ac5cfc38ffb..ee216b8d05a 100644 --- a/runtime/gc_vlhgc/CopyForwardSchemeTask.cpp +++ b/runtime/gc_vlhgc/CopyForwardSchemeTask.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcfg.h" diff --git a/runtime/gc_vlhgc/CopyForwardSchemeTask.hpp b/runtime/gc_vlhgc/CopyForwardSchemeTask.hpp index 81d4a69f444..7b543f53ebc 100644 --- a/runtime/gc_vlhgc/CopyForwardSchemeTask.hpp +++ b/runtime/gc_vlhgc/CopyForwardSchemeTask.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(COPYFORWARDSCHEMETASK_HPP_) diff --git a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.cpp b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.cpp index a2d2e3b5063..accfa661e13 100644 --- a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.cpp +++ b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.hpp b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.hpp index 2660a0d6176..318e5e3bb24 100644 --- a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.hpp +++ b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.cpp b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.cpp index a350226344e..9805b4c935e 100644 --- a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.cpp +++ b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.hpp b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.hpp index db70713b3d5..c4a3ed22113 100644 --- a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.hpp +++ b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CopyScanCacheListVLHGC.cpp b/runtime/gc_vlhgc/CopyScanCacheListVLHGC.cpp index 5ea14b4ffbc..0536f70c828 100644 --- a/runtime/gc_vlhgc/CopyScanCacheListVLHGC.cpp +++ b/runtime/gc_vlhgc/CopyScanCacheListVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/CopyScanCacheListVLHGC.hpp b/runtime/gc_vlhgc/CopyScanCacheListVLHGC.hpp index bbd01306aa3..5a3e1246ee6 100644 --- a/runtime/gc_vlhgc/CopyScanCacheListVLHGC.hpp +++ b/runtime/gc_vlhgc/CopyScanCacheListVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CopyScanCacheVLHGC.cpp b/runtime/gc_vlhgc/CopyScanCacheVLHGC.cpp index 8d47c0a2b47..24077b8d34e 100644 --- a/runtime/gc_vlhgc/CopyScanCacheVLHGC.cpp +++ b/runtime/gc_vlhgc/CopyScanCacheVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CopyScanCacheVLHGC.hpp" diff --git a/runtime/gc_vlhgc/CopyScanCacheVLHGC.hpp b/runtime/gc_vlhgc/CopyScanCacheVLHGC.hpp index 171d3802a62..30ef8ffe6b6 100644 --- a/runtime/gc_vlhgc/CopyScanCacheVLHGC.hpp +++ b/runtime/gc_vlhgc/CopyScanCacheVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/CycleStateVLHGC.cpp b/runtime/gc_vlhgc/CycleStateVLHGC.cpp index 38e0bce8b0f..3300549f7b3 100644 --- a/runtime/gc_vlhgc/CycleStateVLHGC.cpp +++ b/runtime/gc_vlhgc/CycleStateVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CycleStateVLHGC.hpp" diff --git a/runtime/gc_vlhgc/CycleStateVLHGC.hpp b/runtime/gc_vlhgc/CycleStateVLHGC.hpp index 9c5195438e6..2b2beb76290 100644 --- a/runtime/gc_vlhgc/CycleStateVLHGC.hpp +++ b/runtime/gc_vlhgc/CycleStateVLHGC.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CYCLESTATEVLHGC_HPP_) diff --git a/runtime/gc_vlhgc/EnvironmentVLHGC.cpp b/runtime/gc_vlhgc/EnvironmentVLHGC.cpp index 1bff5669f07..61ad5717372 100644 --- a/runtime/gc_vlhgc/EnvironmentVLHGC.cpp +++ b/runtime/gc_vlhgc/EnvironmentVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/EnvironmentVLHGC.hpp b/runtime/gc_vlhgc/EnvironmentVLHGC.hpp index e689c9a4c30..c77c4a3c3b8 100644 --- a/runtime/gc_vlhgc/EnvironmentVLHGC.hpp +++ b/runtime/gc_vlhgc/EnvironmentVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/GlobalAllocationManagerTarok.cpp b/runtime/gc_vlhgc/GlobalAllocationManagerTarok.cpp index 5f9bf7a26f4..04ed9bfbc28 100644 --- a/runtime/gc_vlhgc/GlobalAllocationManagerTarok.cpp +++ b/runtime/gc_vlhgc/GlobalAllocationManagerTarok.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalAllocationManagerTarok.hpp b/runtime/gc_vlhgc/GlobalAllocationManagerTarok.hpp index 6da932b51d7..8b103ec8763 100644 --- a/runtime/gc_vlhgc/GlobalAllocationManagerTarok.hpp +++ b/runtime/gc_vlhgc/GlobalAllocationManagerTarok.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalCollectionCardCleaner.cpp b/runtime/gc_vlhgc/GlobalCollectionCardCleaner.cpp index cbebbbdd73e..6a4a7fd642d 100644 --- a/runtime/gc_vlhgc/GlobalCollectionCardCleaner.cpp +++ b/runtime/gc_vlhgc/GlobalCollectionCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/GlobalCollectionCardCleaner.hpp b/runtime/gc_vlhgc/GlobalCollectionCardCleaner.hpp index 8a21600f943..af37f434ba7 100644 --- a/runtime/gc_vlhgc/GlobalCollectionCardCleaner.hpp +++ b/runtime/gc_vlhgc/GlobalCollectionCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.cpp b/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.cpp index 62e0f0f3812..c22bb50a48a 100644 --- a/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.cpp +++ b/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.hpp b/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.hpp index 81c393a5890..5e50565ded4 100644 --- a/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.hpp +++ b/runtime/gc_vlhgc/GlobalCollectionNoScanCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalMarkCardCleaner.cpp b/runtime/gc_vlhgc/GlobalMarkCardCleaner.cpp index 2f32bb5a588..ea4408463dc 100644 --- a/runtime/gc_vlhgc/GlobalMarkCardCleaner.cpp +++ b/runtime/gc_vlhgc/GlobalMarkCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/GlobalMarkCardCleaner.hpp b/runtime/gc_vlhgc/GlobalMarkCardCleaner.hpp index b9c5c1af54c..9e849d68615 100644 --- a/runtime/gc_vlhgc/GlobalMarkCardCleaner.hpp +++ b/runtime/gc_vlhgc/GlobalMarkCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalMarkCardScrubber.cpp b/runtime/gc_vlhgc/GlobalMarkCardScrubber.cpp index 8afbb5a6cfa..9cc7cc094da 100644 --- a/runtime/gc_vlhgc/GlobalMarkCardScrubber.cpp +++ b/runtime/gc_vlhgc/GlobalMarkCardScrubber.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/GlobalMarkCardScrubber.hpp b/runtime/gc_vlhgc/GlobalMarkCardScrubber.hpp index 5378381cbdd..d0506b3b24e 100644 --- a/runtime/gc_vlhgc/GlobalMarkCardScrubber.hpp +++ b/runtime/gc_vlhgc/GlobalMarkCardScrubber.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalMarkDelegate.cpp b/runtime/gc_vlhgc/GlobalMarkDelegate.cpp index b0a63d07ef1..5cac6c6c860 100644 --- a/runtime/gc_vlhgc/GlobalMarkDelegate.cpp +++ b/runtime/gc_vlhgc/GlobalMarkDelegate.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/GlobalMarkDelegate.hpp b/runtime/gc_vlhgc/GlobalMarkDelegate.hpp index 23ce306d4f6..31185ad8357 100644 --- a/runtime/gc_vlhgc/GlobalMarkDelegate.hpp +++ b/runtime/gc_vlhgc/GlobalMarkDelegate.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.cpp b/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.cpp index 08d7282f962..fc5ae8b4054 100644 --- a/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.cpp +++ b/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.hpp b/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.hpp index 1c33fae5e71..82751caddf1 100644 --- a/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.hpp +++ b/runtime/gc_vlhgc/GlobalMarkNoScanCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalMarkingScheme.cpp b/runtime/gc_vlhgc/GlobalMarkingScheme.cpp index fe967f6c391..efd7f2be1b6 100644 --- a/runtime/gc_vlhgc/GlobalMarkingScheme.cpp +++ b/runtime/gc_vlhgc/GlobalMarkingScheme.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/GlobalMarkingScheme.hpp b/runtime/gc_vlhgc/GlobalMarkingScheme.hpp index a8d8e77c92d..b70b10b830c 100644 --- a/runtime/gc_vlhgc/GlobalMarkingScheme.hpp +++ b/runtime/gc_vlhgc/GlobalMarkingScheme.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/HeapRegionDataForAllocate.cpp b/runtime/gc_vlhgc/HeapRegionDataForAllocate.cpp index b0e64bf1542..3011046a4d4 100644 --- a/runtime/gc_vlhgc/HeapRegionDataForAllocate.cpp +++ b/runtime/gc_vlhgc/HeapRegionDataForAllocate.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/HeapRegionDataForAllocate.hpp b/runtime/gc_vlhgc/HeapRegionDataForAllocate.hpp index 059fd53197d..3e40bca4e4c 100644 --- a/runtime/gc_vlhgc/HeapRegionDataForAllocate.hpp +++ b/runtime/gc_vlhgc/HeapRegionDataForAllocate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPREGIONDATAFORALLOCATE_HPP) diff --git a/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.cpp b/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.cpp index c5748c118c7..83828684883 100644 --- a/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.cpp +++ b/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.hpp b/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.hpp index a474f651310..0fc792359fb 100644 --- a/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.hpp +++ b/runtime/gc_vlhgc/HeapRegionDataForCompactVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPREGIONDATAFORCOMPACTVLHGC_HPP) diff --git a/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.cpp b/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.cpp index d9227b82bad..fc603f8e73d 100644 --- a/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.cpp +++ b/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.hpp b/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.hpp index 4d163bd3b1f..435daea355c 100644 --- a/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.hpp +++ b/runtime/gc_vlhgc/HeapRegionDescriptorVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPREGIONDESCRIPTORVLHGC_HPP) diff --git a/runtime/gc_vlhgc/HeapRegionIteratorVLHGC.hpp b/runtime/gc_vlhgc/HeapRegionIteratorVLHGC.hpp index b4b05382691..d355f5f72a4 100644 --- a/runtime/gc_vlhgc/HeapRegionIteratorVLHGC.hpp +++ b/runtime/gc_vlhgc/HeapRegionIteratorVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPREGIONITERATORVLHGC_HPP) diff --git a/runtime/gc_vlhgc/HeapRegionManagerVLHGC.cpp b/runtime/gc_vlhgc/HeapRegionManagerVLHGC.cpp index c4718422e92..0d751af6ab9 100644 --- a/runtime/gc_vlhgc/HeapRegionManagerVLHGC.cpp +++ b/runtime/gc_vlhgc/HeapRegionManagerVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CardTable.hpp" diff --git a/runtime/gc_vlhgc/HeapRegionManagerVLHGC.hpp b/runtime/gc_vlhgc/HeapRegionManagerVLHGC.hpp index 83149663bd2..242a687c5ad 100644 --- a/runtime/gc_vlhgc/HeapRegionManagerVLHGC.hpp +++ b/runtime/gc_vlhgc/HeapRegionManagerVLHGC.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(HEAPREGIONMANAGERVLHGC_HPP) diff --git a/runtime/gc_vlhgc/IncrementalCardTable.cpp b/runtime/gc_vlhgc/IncrementalCardTable.cpp index 25013c3242b..411ef92cbe4 100644 --- a/runtime/gc_vlhgc/IncrementalCardTable.cpp +++ b/runtime/gc_vlhgc/IncrementalCardTable.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/IncrementalCardTable.hpp b/runtime/gc_vlhgc/IncrementalCardTable.hpp index 7fb4a72de1f..e634ae58f60 100644 --- a/runtime/gc_vlhgc/IncrementalCardTable.hpp +++ b/runtime/gc_vlhgc/IncrementalCardTable.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/IncrementalGenerationalGC.cpp b/runtime/gc_vlhgc/IncrementalGenerationalGC.cpp index d55c582816a..0900e0abfae 100644 --- a/runtime/gc_vlhgc/IncrementalGenerationalGC.cpp +++ b/runtime/gc_vlhgc/IncrementalGenerationalGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/IncrementalGenerationalGC.hpp b/runtime/gc_vlhgc/IncrementalGenerationalGC.hpp index 7546809a529..74ee2b54065 100644 --- a/runtime/gc_vlhgc/IncrementalGenerationalGC.hpp +++ b/runtime/gc_vlhgc/IncrementalGenerationalGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/InterRegionRememberedSet.cpp b/runtime/gc_vlhgc/InterRegionRememberedSet.cpp index cca10fa51e3..569912cec46 100644 --- a/runtime/gc_vlhgc/InterRegionRememberedSet.cpp +++ b/runtime/gc_vlhgc/InterRegionRememberedSet.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/gc_vlhgc/InterRegionRememberedSet.hpp b/runtime/gc_vlhgc/InterRegionRememberedSet.hpp index b387c4faf53..34e998f15a1 100644 --- a/runtime/gc_vlhgc/InterRegionRememberedSet.hpp +++ b/runtime/gc_vlhgc/InterRegionRememberedSet.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/LeafAwareMixedObjectIterator.hpp b/runtime/gc_vlhgc/LeafAwareMixedObjectIterator.hpp index 2169a6d3516..bec6f75185c 100644 --- a/runtime/gc_vlhgc/LeafAwareMixedObjectIterator.hpp +++ b/runtime/gc_vlhgc/LeafAwareMixedObjectIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/MarkMapManager.cpp b/runtime/gc_vlhgc/MarkMapManager.cpp index 4b285e832c6..1570a099c48 100644 --- a/runtime/gc_vlhgc/MarkMapManager.cpp +++ b/runtime/gc_vlhgc/MarkMapManager.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/MarkMapManager.hpp b/runtime/gc_vlhgc/MarkMapManager.hpp index f112d7a025e..7210d0a0157 100644 --- a/runtime/gc_vlhgc/MarkMapManager.hpp +++ b/runtime/gc_vlhgc/MarkMapManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/MemorySubSpaceTarok.cpp b/runtime/gc_vlhgc/MemorySubSpaceTarok.cpp index b8df0698de9..a8bf70e5a58 100644 --- a/runtime/gc_vlhgc/MemorySubSpaceTarok.cpp +++ b/runtime/gc_vlhgc/MemorySubSpaceTarok.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/gc_vlhgc/MemorySubSpaceTarok.hpp b/runtime/gc_vlhgc/MemorySubSpaceTarok.hpp index e3968f8887c..f62a4296f0f 100644 --- a/runtime/gc_vlhgc/MemorySubSpaceTarok.hpp +++ b/runtime/gc_vlhgc/MemorySubSpaceTarok.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.cpp b/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.cpp index 131fb0ec383..f8d0472cd82 100644 --- a/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.cpp +++ b/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.hpp b/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.hpp index e03305c3d59..e84d70c8969 100644 --- a/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.hpp +++ b/runtime/gc_vlhgc/OwnableSynchronizerObjectBufferVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OWABLESYNCHRONIZEROBJECTBUFFERVLHGC_HPP_ diff --git a/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.cpp b/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.cpp index a12805f6a87..edd64216d3c 100644 --- a/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.cpp +++ b/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.cpp @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.hpp b/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.hpp index 49d70a5529d..d075f973165 100644 --- a/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.hpp +++ b/runtime/gc_vlhgc/ParallelSweepSchemeVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.cpp b/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.cpp index f6f33a386c5..ae8bb43c9b9 100644 --- a/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.cpp +++ b/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.hpp b/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.hpp index ce75b8bb272..ea2c2e252d4 100644 --- a/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.hpp +++ b/runtime/gc_vlhgc/ProjectedSurvivalCollectionSetDelegate.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ReclaimDelegate.cpp b/runtime/gc_vlhgc/ReclaimDelegate.cpp index bf9614b9513..b72fd868b00 100644 --- a/runtime/gc_vlhgc/ReclaimDelegate.cpp +++ b/runtime/gc_vlhgc/ReclaimDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ReclaimDelegate.hpp b/runtime/gc_vlhgc/ReclaimDelegate.hpp index a3f0f04990a..e4509cf7b57 100644 --- a/runtime/gc_vlhgc/ReclaimDelegate.hpp +++ b/runtime/gc_vlhgc/ReclaimDelegate.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.cpp b/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.cpp index 4c3acf56219..c8e4ca5c71e 100644 --- a/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.cpp +++ b/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.hpp b/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.hpp index 5e1720b7192..87950608496 100644 --- a/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.hpp +++ b/runtime/gc_vlhgc/ReferenceObjectBufferVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef REFERENCEOBJECTBUFFERVLHGC_HPP_ diff --git a/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.cpp b/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.cpp index 69822cd06e8..d7c6197ed33 100644 --- a/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.cpp +++ b/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.hpp b/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.hpp index ff34062be6c..5179491dc95 100644 --- a/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.hpp +++ b/runtime/gc_vlhgc/RegionBasedOverflowVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/RegionListTarok.cpp b/runtime/gc_vlhgc/RegionListTarok.cpp index 9308454db60..88005e8e2ad 100644 --- a/runtime/gc_vlhgc/RegionListTarok.cpp +++ b/runtime/gc_vlhgc/RegionListTarok.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/RegionListTarok.hpp b/runtime/gc_vlhgc/RegionListTarok.hpp index bd3783bf047..d82d9332911 100644 --- a/runtime/gc_vlhgc/RegionListTarok.hpp +++ b/runtime/gc_vlhgc/RegionListTarok.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/RegionValidator.cpp b/runtime/gc_vlhgc/RegionValidator.cpp index 4215a0c6b45..d7c249334d3 100644 --- a/runtime/gc_vlhgc/RegionValidator.cpp +++ b/runtime/gc_vlhgc/RegionValidator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/gc_vlhgc/RegionValidator.hpp b/runtime/gc_vlhgc/RegionValidator.hpp index 5f667522d15..21adb444b12 100644 --- a/runtime/gc_vlhgc/RegionValidator.hpp +++ b/runtime/gc_vlhgc/RegionValidator.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/RememberedSetCard.hpp b/runtime/gc_vlhgc/RememberedSetCard.hpp index 20b19cc9304..e13e9297d88 100644 --- a/runtime/gc_vlhgc/RememberedSetCard.hpp +++ b/runtime/gc_vlhgc/RememberedSetCard.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/RememberedSetCardBucket.cpp b/runtime/gc_vlhgc/RememberedSetCardBucket.cpp index d83becc6861..b319a9b7afd 100644 --- a/runtime/gc_vlhgc/RememberedSetCardBucket.cpp +++ b/runtime/gc_vlhgc/RememberedSetCardBucket.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "AtomicOperations.hpp" diff --git a/runtime/gc_vlhgc/RememberedSetCardBucket.hpp b/runtime/gc_vlhgc/RememberedSetCardBucket.hpp index 5a546b4ae02..a456655dff9 100644 --- a/runtime/gc_vlhgc/RememberedSetCardBucket.hpp +++ b/runtime/gc_vlhgc/RememberedSetCardBucket.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REMEMBEREDSETCARDBUCKET_HPP) diff --git a/runtime/gc_vlhgc/RememberedSetCardList.cpp b/runtime/gc_vlhgc/RememberedSetCardList.cpp index 909f2e52d15..3c2497b234b 100644 --- a/runtime/gc_vlhgc/RememberedSetCardList.cpp +++ b/runtime/gc_vlhgc/RememberedSetCardList.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "HeapRegionManager.hpp" diff --git a/runtime/gc_vlhgc/RememberedSetCardList.hpp b/runtime/gc_vlhgc/RememberedSetCardList.hpp index 47420d8fe36..9bb46c7fa5c 100644 --- a/runtime/gc_vlhgc/RememberedSetCardList.hpp +++ b/runtime/gc_vlhgc/RememberedSetCardList.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REMEMBEREDSETCARDLIST_HPP) diff --git a/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.cpp b/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.cpp index ac58042b397..89d18b01b1c 100644 --- a/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.cpp +++ b/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "InterRegionRememberedSet.hpp" diff --git a/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.hpp b/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.hpp index 25a3e7c1ba9..feccf7fc728 100644 --- a/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.hpp +++ b/runtime/gc_vlhgc/RememberedSetCardListBufferIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REMEMBEREDSETCARDLISTBUFFERITERATOR_HPP) diff --git a/runtime/gc_vlhgc/RememberedSetCardListCardIterator.cpp b/runtime/gc_vlhgc/RememberedSetCardListCardIterator.cpp index 249ef4a7d91..2d78ff8ddf3 100644 --- a/runtime/gc_vlhgc/RememberedSetCardListCardIterator.cpp +++ b/runtime/gc_vlhgc/RememberedSetCardListCardIterator.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "RememberedSetCardListCardIterator.hpp" diff --git a/runtime/gc_vlhgc/RememberedSetCardListCardIterator.hpp b/runtime/gc_vlhgc/RememberedSetCardListCardIterator.hpp index d290c13da4b..80818febcd4 100644 --- a/runtime/gc_vlhgc/RememberedSetCardListCardIterator.hpp +++ b/runtime/gc_vlhgc/RememberedSetCardListCardIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(REMEMBEREDSETCARDLISTCARDITERATOR_HPP) diff --git a/runtime/gc_vlhgc/RuntimeExecManager.cpp b/runtime/gc_vlhgc/RuntimeExecManager.cpp index 5017f05c52c..cd4c169e191 100644 --- a/runtime/gc_vlhgc/RuntimeExecManager.cpp +++ b/runtime/gc_vlhgc/RuntimeExecManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/RuntimeExecManager.hpp b/runtime/gc_vlhgc/RuntimeExecManager.hpp index 30f73602f5b..97b00417b3a 100644 --- a/runtime/gc_vlhgc/RuntimeExecManager.hpp +++ b/runtime/gc_vlhgc/RuntimeExecManager.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/SchedulingDelegate.cpp b/runtime/gc_vlhgc/SchedulingDelegate.cpp index 949f2c5188c..4e5060a489e 100644 --- a/runtime/gc_vlhgc/SchedulingDelegate.cpp +++ b/runtime/gc_vlhgc/SchedulingDelegate.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/SchedulingDelegate.hpp b/runtime/gc_vlhgc/SchedulingDelegate.hpp index 4c434546b2f..2bea36d2c79 100644 --- a/runtime/gc_vlhgc/SchedulingDelegate.hpp +++ b/runtime/gc_vlhgc/SchedulingDelegate.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/SurvivorMemoryIterator.hpp b/runtime/gc_vlhgc/SurvivorMemoryIterator.hpp index 72d10ffd484..821ac925801 100644 --- a/runtime/gc_vlhgc/SurvivorMemoryIterator.hpp +++ b/runtime/gc_vlhgc/SurvivorMemoryIterator.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SURVIVORMEMORYITERATOR_HPP_) #define SURVIVORMEMORYITERATOR_HPP_ diff --git a/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.cpp b/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.cpp index e1553753724..a33f4a7af5a 100644 --- a/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.cpp +++ b/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.hpp b/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.hpp index 69367c68912..622c6d5cf96 100644 --- a/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.hpp +++ b/runtime/gc_vlhgc/SweepHeapSectioningVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SWEEPSCHEMESECTIONINGSEGMENTEDVLHGC_HPP_) diff --git a/runtime/gc_vlhgc/SweepPoolManagerVLHGC.cpp b/runtime/gc_vlhgc/SweepPoolManagerVLHGC.cpp index 78510ea7059..11e04bc9714 100644 --- a/runtime/gc_vlhgc/SweepPoolManagerVLHGC.cpp +++ b/runtime/gc_vlhgc/SweepPoolManagerVLHGC.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omrcomp.h" diff --git a/runtime/gc_vlhgc/SweepPoolManagerVLHGC.hpp b/runtime/gc_vlhgc/SweepPoolManagerVLHGC.hpp index cb6d07a03ac..c0ae1eef927 100644 --- a/runtime/gc_vlhgc/SweepPoolManagerVLHGC.hpp +++ b/runtime/gc_vlhgc/SweepPoolManagerVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.cpp b/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.cpp index 4cdcd78083d..1b50d480361 100644 --- a/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.cpp +++ b/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.hpp b/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.hpp index 5b47356e7c3..9726c00a7b3 100644 --- a/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.hpp +++ b/runtime/gc_vlhgc/UnfinalizedObjectBufferVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef UNFINALIZEDOBJECTBUFFERVLHGC_HPP_ diff --git a/runtime/gc_vlhgc/VLHGCAccessBarrier.cpp b/runtime/gc_vlhgc/VLHGCAccessBarrier.cpp index ab848da28f9..54cbe574001 100644 --- a/runtime/gc_vlhgc/VLHGCAccessBarrier.cpp +++ b/runtime/gc_vlhgc/VLHGCAccessBarrier.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/VLHGCAccessBarrier.hpp b/runtime/gc_vlhgc/VLHGCAccessBarrier.hpp index 515dd1779cd..1fac62182c2 100644 --- a/runtime/gc_vlhgc/VLHGCAccessBarrier.hpp +++ b/runtime/gc_vlhgc/VLHGCAccessBarrier.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/WorkPacketsVLHGC.cpp b/runtime/gc_vlhgc/WorkPacketsVLHGC.cpp index 5d47cd04f45..52cd3b224b1 100644 --- a/runtime/gc_vlhgc/WorkPacketsVLHGC.cpp +++ b/runtime/gc_vlhgc/WorkPacketsVLHGC.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/gc_vlhgc/WorkPacketsVLHGC.hpp b/runtime/gc_vlhgc/WorkPacketsVLHGC.hpp index 08c8a4f6d07..45e25688934 100644 --- a/runtime/gc_vlhgc/WorkPacketsVLHGC.hpp +++ b/runtime/gc_vlhgc/WorkPacketsVLHGC.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/WriteOnceCompactor.cpp b/runtime/gc_vlhgc/WriteOnceCompactor.cpp index dce46861fc5..eaaa6d2bde5 100644 --- a/runtime/gc_vlhgc/WriteOnceCompactor.cpp +++ b/runtime/gc_vlhgc/WriteOnceCompactor.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/gc_vlhgc/WriteOnceCompactor.hpp b/runtime/gc_vlhgc/WriteOnceCompactor.hpp index d4df128884a..3d48b2a46fe 100644 --- a/runtime/gc_vlhgc/WriteOnceCompactor.hpp +++ b/runtime/gc_vlhgc/WriteOnceCompactor.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.cpp b/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.cpp index d98271204b3..47eeaf269db 100644 --- a/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.cpp +++ b/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.hpp b/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.hpp index 126d8212117..a072b40e844 100644 --- a/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.hpp +++ b/runtime/gc_vlhgc/WriteOnceFixupCardCleaner.hpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gc_vlhgc/module.xml b/runtime/gc_vlhgc/module.xml index 6d89cdc14cc..676bcffce27 100644 --- a/runtime/gc_vlhgc/module.xml +++ b/runtime/gc_vlhgc/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/gcchk/CMakeLists.txt b/runtime/gcchk/CMakeLists.txt index 32379cad283..9702e7ce4fc 100644 --- a/runtime/gcchk/CMakeLists.txt +++ b/runtime/gcchk/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(gcchk_sources diff --git a/runtime/gcchk/gcchk.cpp b/runtime/gcchk/gcchk.cpp index fd18d055667..c63be5e1428 100644 --- a/runtime/gcchk/gcchk.cpp +++ b/runtime/gcchk/gcchk.cpp @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gcchk/gcchk.h b/runtime/gcchk/gcchk.h index 5ee869c24b0..22a35afba4a 100644 --- a/runtime/gcchk/gcchk.h +++ b/runtime/gcchk/gcchk.h @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/gcchk/module.xml b/runtime/gcchk/module.xml index 94b043b4e1b..a296d43b5af 100644 --- a/runtime/gcchk/module.xml +++ b/runtime/gcchk/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/hookable/CMakeLists.txt b/runtime/hookable/CMakeLists.txt index 039349bbaa4..68f3daea79e 100644 --- a/runtime/hookable/CMakeLists.txt +++ b/runtime/hookable/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9hookable SHARED diff --git a/runtime/hookable/hookableshared.mk.ftl b/runtime/hookable/hookableshared.mk.ftl index ba8d2153ff9..7e9ca918d2c 100644 --- a/runtime/hookable/hookableshared.mk.ftl +++ b/runtime/hookable/hookableshared.mk.ftl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This makefile is generated using an UMA template. diff --git a/runtime/hookable/module.xml b/runtime/hookable/module.xml index 3d92b1aedb7..16f00d5fb76 100644 --- a/runtime/hookable/module.xml +++ b/runtime/hookable/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/include/about.html b/runtime/include/about.html index 649dde40e4f..de746138526 100644 --- a/runtime/include/about.html +++ b/runtime/include/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/runtime/include/cdt-hacks.h b/runtime/include/cdt-hacks.h index ab881fbdf74..1dcdd1ca3fa 100644 --- a/runtime/include/cdt-hacks.h +++ b/runtime/include/cdt-hacks.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #error "This file exists only to make CDT happy and should never be included by code." diff --git a/runtime/include/exelib_api.h b/runtime/include/exelib_api.h index 4fbe71eebe3..9629bd5a18d 100644 --- a/runtime/include/exelib_api.h +++ b/runtime/include/exelib_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef exelib_api_h diff --git a/runtime/include/ibmjvmti.h b/runtime/include/ibmjvmti.h index cbb6550c249..243d5aba215 100644 --- a/runtime/include/ibmjvmti.h +++ b/runtime/include/ibmjvmti.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ibmjvmti_h diff --git a/runtime/include/include_internal.h b/runtime/include/include_internal.h index aa8bd469a25..9c07f2ecfbc 100644 --- a/runtime/include/include_internal.h +++ b/runtime/include/include_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef include_internal_h diff --git a/runtime/include/j9cfg.h.ftl b/runtime/include/j9cfg.h.ftl index 86a8a460540..9824dd62ae8 100644 --- a/runtime/include/j9cfg.h.ftl +++ b/runtime/include/j9cfg.h.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9CFG_H diff --git a/runtime/include/j9cfg.h.in b/runtime/include/j9cfg.h.in index f4cdc7843d4..6b648e95d00 100644 --- a/runtime/include/j9cfg.h.in +++ b/runtime/include/j9cfg.h.in @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9CFG_H diff --git a/runtime/include/j9javaPriority.h b/runtime/include/j9javaPriority.h index 89b5c53fc8d..b272538163e 100644 --- a/runtime/include/j9javaPriority.h +++ b/runtime/include/j9javaPriority.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9javaPriority_h diff --git a/runtime/include/j9lib.h.ftl b/runtime/include/j9lib.h.ftl index ef7090faaf0..de90c8e0635 100644 --- a/runtime/include/j9lib.h.ftl +++ b/runtime/include/j9lib.h.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9LIB_H) diff --git a/runtime/include/j9lib.h.in b/runtime/include/j9lib.h.in index d269db0275d..33ee689eeac 100644 --- a/runtime/include/j9lib.h.in +++ b/runtime/include/j9lib.h.in @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /*TODO: this actually needs to be generated */ #if !defined(J9LIB_H) diff --git a/runtime/include/j9memcategories.h b/runtime/include/j9memcategories.h index 5c313058302..4b8c1de37bb 100644 --- a/runtime/include/j9memcategories.h +++ b/runtime/include/j9memcategories.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9MEMCATEGORIES_H diff --git a/runtime/include/j9static.h b/runtime/include/j9static.h index fb430a4b542..a6b74294d39 100644 --- a/runtime/include/j9static.h +++ b/runtime/include/j9static.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9static_h diff --git a/runtime/include/j9version.h.ftl b/runtime/include/j9version.h.ftl index a3e45a88840..49ac4528980 100644 --- a/runtime/include/j9version.h.ftl +++ b/runtime/include/j9version.h.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9VERSION_H diff --git a/runtime/include/j9version.h.in b/runtime/include/j9version.h.in index 06a14c66579..1e633d2b25a 100644 --- a/runtime/include/j9version.h.in +++ b/runtime/include/j9version.h.in @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9VERSION_H diff --git a/runtime/include/j9vmls.h b/runtime/include/j9vmls.h index 5b750c0253c..193122f75b9 100644 --- a/runtime/include/j9vmls.h +++ b/runtime/include/j9vmls.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/include/jni.h.m4 b/runtime/include/jni.h.m4 index dde62bde95e..b86dd4024bc 100644 --- a/runtime/include/jni.h.m4 +++ b/runtime/include/jni.h.m4 @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JNI_H diff --git a/runtime/include/jni_convert.h b/runtime/include/jni_convert.h index 5fb0228a30e..f779cdba849 100644 --- a/runtime/include/jni_convert.h +++ b/runtime/include/jni_convert.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JNI_CONVERT_H #define JNI_CONVERT_H diff --git a/runtime/include/jniport.h b/runtime/include/jniport.h index e3789c279ec..604aaef63b9 100644 --- a/runtime/include/jniport.h +++ b/runtime/include/jniport.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jniport_h diff --git a/runtime/include/jvmri.h b/runtime/include/jvmri.h index 41eac0b5afa..5d89bbf1916 100644 --- a/runtime/include/jvmri.h +++ b/runtime/include/jvmri.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _IBM_JVMRAS_H_ diff --git a/runtime/include/jvmti.h.m4 b/runtime/include/jvmti.h.m4 index de826f58135..70da85acc30 100644 --- a/runtime/include/jvmti.h.m4 +++ b/runtime/include/jvmti.h.m4 @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ changequote(`[',`]')dnl diff --git a/runtime/include/locknursery.h b/runtime/include/locknursery.h index e5c6ec82125..572c7d28620 100644 --- a/runtime/include/locknursery.h +++ b/runtime/include/locknursery.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef locknursery_h diff --git a/runtime/include/module.xml b/runtime/include/module.xml index 12235c4cb68..f7530a80717 100644 --- a/runtime/include/module.xml +++ b/runtime/include/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/include/rastrace_external.h b/runtime/include/rastrace_external.h index 9ba51c54e5d..968c1892dd8 100644 --- a/runtime/include/rastrace_external.h +++ b/runtime/include/rastrace_external.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RASTRACE_EXTERNAL_H diff --git a/runtime/include/ute.h b/runtime/include/ute.h index 1d941b44949..6f8f5320e28 100644 --- a/runtime/include/ute.h +++ b/runtime/include/ute.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _IBM_UTE_H #define _IBM_UTE_H diff --git a/runtime/include/vendor_version.h b/runtime/include/vendor_version.h index 11632c52e33..8c579258001 100644 --- a/runtime/include/vendor_version.h +++ b/runtime/include/vendor_version.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This file provides a means to supply vendor specific version info such as diff --git a/runtime/include/vmi.h b/runtime/include/vmi.h index 7e297554466..2d57dc08dd0 100644 --- a/runtime/include/vmi.h +++ b/runtime/include/vmi.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/include/vmizip.h b/runtime/include/vmizip.h index cdba932a7e2..a79afaa21a0 100644 --- a/runtime/include/vmizip.h +++ b/runtime/include/vmizip.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vmizip_h #define vmizip_h diff --git a/runtime/include/windows_api.h b/runtime/include/windows_api.h index 8108383843a..ed99987d5bc 100644 --- a/runtime/include/windows_api.h +++ b/runtime/include/windows_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) || defined (WIN64) diff --git a/runtime/include/zip_api.h b/runtime/include/zip_api.h index a70d5c40a7e..146fc5f3c1c 100644 --- a/runtime/include/zip_api.h +++ b/runtime/include/zip_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef zip_api_h diff --git a/runtime/include/zipsup.h b/runtime/include/zipsup.h index 7252f55392f..da420398723 100644 --- a/runtime/include/zipsup.h +++ b/runtime/include/zipsup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/include31/module.xml b/runtime/include31/module.xml index 937163a0b78..e89a0494f8c 100644 --- a/runtime/include31/module.xml +++ b/runtime/include31/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/j9jitbuilder/JavaMethodCallbackGen.cpp b/runtime/j9jitbuilder/JavaMethodCallbackGen.cpp index 7e7e15aa9b8..377f2862d4f 100644 --- a/runtime/j9jitbuilder/JavaMethodCallbackGen.cpp +++ b/runtime/j9jitbuilder/JavaMethodCallbackGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/j9jitbuilder/JavaMethodCallbackGen.hpp b/runtime/j9jitbuilder/JavaMethodCallbackGen.hpp index 8a81413b86a..92f95d23691 100644 --- a/runtime/j9jitbuilder/JavaMethodCallbackGen.hpp +++ b/runtime/j9jitbuilder/JavaMethodCallbackGen.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JAVAMETHODCALLBACK_HPP_ diff --git a/runtime/j9jitbuilder/module.xml b/runtime/j9jitbuilder/module.xml index 45d2870c89a..8a65dc03568 100644 --- a/runtime/j9jitbuilder/module.xml +++ b/runtime/j9jitbuilder/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/j9vm/CMakeLists.txt b/runtime/j9vm/CMakeLists.txt index 06a1a7c573e..6ea58b1a566 100644 --- a/runtime/j9vm/CMakeLists.txt +++ b/runtime/j9vm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/j9vm/asgct.cpp b/runtime/j9vm/asgct.cpp index 43205875af7..2feac023a52 100644 --- a/runtime/j9vm/asgct.cpp +++ b/runtime/j9vm/asgct.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/j9vm/exports.cmake b/runtime/j9vm/exports.cmake index 7c6d7168025..9611be67208 100644 --- a/runtime/j9vm/exports.cmake +++ b/runtime/j9vm/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Wrapper around omr_add_exports which strips windows name mangling (except on 32-bit windows). diff --git a/runtime/j9vm/generated.h.m4 b/runtime/j9vm/generated.h.m4 index f6654014238..f7c26d3cb84 100644 --- a/runtime/j9vm/generated.h.m4 +++ b/runtime/j9vm/generated.h.m4 @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ changequote(`[',`]')dnl diff --git a/runtime/j9vm/j7verify.c b/runtime/j9vm/j7verify.c index b7179b5e285..8765f945553 100644 --- a/runtime/j9vm/j7verify.c +++ b/runtime/j9vm/j7verify.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/j9vm/j7vmi.c b/runtime/j9vm/j7vmi.c index 32d735dc544..7e7f40c7d8b 100644 --- a/runtime/j9vm/j7vmi.c +++ b/runtime/j9vm/j7vmi.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/j9vm/j8vmi.c b/runtime/j9vm/j8vmi.c index 6c949d835ef..c043895f1eb 100644 --- a/runtime/j9vm/j8vmi.c +++ b/runtime/j9vm/j8vmi.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/j9vm/j9memcategories.c b/runtime/j9vm/j9memcategories.c index 445558c71d9..d67c668917e 100644 --- a/runtime/j9vm/j9memcategories.c +++ b/runtime/j9vm/j9memcategories.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/j9vm/j9scar.tdf b/runtime/j9vm/j9scar.tdf index 3f8d43cad4b..52b6e829e34 100644 --- a/runtime/j9vm/j9scar.tdf +++ b/runtime/j9vm/j9scar.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9scar Submodules=j9vmutil,j9util,pool,module diff --git a/runtime/j9vm/j9vm_internal.h b/runtime/j9vm/j9vm_internal.h index 6fd1dc1ae42..e7afdf4e1e5 100644 --- a/runtime/j9vm/j9vm_internal.h +++ b/runtime/j9vm/j9vm_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9vm_internal_h diff --git a/runtime/j9vm/j9vmnatives.xml b/runtime/j9vm/j9vmnatives.xml index 57d244efea8..913d4071a25 100644 --- a/runtime/j9vm/j9vmnatives.xml +++ b/runtime/j9vm/j9vmnatives.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/j9vm/java11vmi.c b/runtime/j9vm/java11vmi.c index d4700979f2c..502a0354a3e 100644 --- a/runtime/j9vm/java11vmi.c +++ b/runtime/j9vm/java11vmi.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/j9vm/javanextvmi.cpp b/runtime/j9vm/javanextvmi.cpp index 7997e818dc3..2880e95eb36 100644 --- a/runtime/j9vm/javanextvmi.cpp +++ b/runtime/j9vm/javanextvmi.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/j9vm/jvm.c b/runtime/j9vm/jvm.c index c2c699a995b..8b64b5eb2ee 100644 --- a/runtime/j9vm/jvm.c +++ b/runtime/j9vm/jvm.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if 0 diff --git a/runtime/j9vm/jvm.h b/runtime/j9vm/jvm.h index 4354369c60b..94b93254e58 100644 --- a/runtime/j9vm/jvm.h +++ b/runtime/j9vm/jvm.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/j9vm/module.xml b/runtime/j9vm/module.xml index 95ed4427fde..813cdbd488d 100644 --- a/runtime/j9vm/module.xml +++ b/runtime/j9vm/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/j9vm/vmi.c b/runtime/j9vm/vmi.c index 207a8551f57..9b60425274f 100644 --- a/runtime/j9vm/vmi.c +++ b/runtime/j9vm/vmi.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/j9vm31/CMakeLists.txt b/runtime/j9vm31/CMakeLists.txt index 02fd2f87352..74400fc6751 100644 --- a/runtime/j9vm31/CMakeLists.txt +++ b/runtime/j9vm31/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/j9vm31/exports.cmake b/runtime/j9vm31/exports.cmake index ce0a626e79e..f9c00605c95 100644 --- a/runtime/j9vm31/exports.cmake +++ b/runtime/j9vm31/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_exports(jvm31 diff --git a/runtime/j9vm31/j9cel4ro64.c b/runtime/j9vm31/j9cel4ro64.c index 42797a98e27..7a812d2d21d 100644 --- a/runtime/j9vm31/j9cel4ro64.c +++ b/runtime/j9vm31/j9cel4ro64.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cel4ro64.h" diff --git a/runtime/j9vm31/j9cel4ro64.h b/runtime/j9vm31/j9cel4ro64.h index ac8cad47c06..b32caa68b5b 100644 --- a/runtime/j9vm31/j9cel4ro64.h +++ b/runtime/j9vm31/j9cel4ro64.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9cel4ro64_h diff --git a/runtime/j9vm31/j9vm31.h b/runtime/j9vm31/j9vm31.h index f653fe3821e..180b82f00f3 100644 --- a/runtime/j9vm31/j9vm31.h +++ b/runtime/j9vm31/j9vm31.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9vm31_h diff --git a/runtime/j9vm31/j9vm31natives.xml b/runtime/j9vm31/j9vm31natives.xml index 738d3800993..c70bfc5ce23 100644 --- a/runtime/j9vm31/j9vm31natives.xml +++ b/runtime/j9vm31/j9vm31natives.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/j9vm31/jnicgen.cpp b/runtime/j9vm31/jnicgen.cpp index 08622eaaa66..5abfe4aa094 100644 --- a/runtime/j9vm31/jnicgen.cpp +++ b/runtime/j9vm31/jnicgen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vm31.h" diff --git a/runtime/j9vm31/jnicsup.cpp b/runtime/j9vm31/jnicsup.cpp index a96c7137959..c470962dbfe 100644 --- a/runtime/j9vm31/jnicsup.cpp +++ b/runtime/j9vm31/jnicsup.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vm31.h" diff --git a/runtime/j9vm31/jnifield.cpp b/runtime/j9vm31/jnifield.cpp index 5aef60e3935..b3dc6fe34ce 100644 --- a/runtime/j9vm31/jnifield.cpp +++ b/runtime/j9vm31/jnifield.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vm31.h" diff --git a/runtime/j9vm31/jniinv.cpp b/runtime/j9vm31/jniinv.cpp index e9f2633cc43..8eb3358ac02 100644 --- a/runtime/j9vm31/jniinv.cpp +++ b/runtime/j9vm31/jniinv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vm31.h" diff --git a/runtime/j9vm31/jnimisc.cpp b/runtime/j9vm31/jnimisc.cpp index b783e058c98..905217b2395 100644 --- a/runtime/j9vm31/jnimisc.cpp +++ b/runtime/j9vm31/jnimisc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vm31.h" diff --git a/runtime/j9vm31/jnireflect.cpp b/runtime/j9vm31/jnireflect.cpp index ddf0a187f11..126052d42f8 100644 --- a/runtime/j9vm31/jnireflect.cpp +++ b/runtime/j9vm31/jnireflect.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vm31.h" diff --git a/runtime/j9vm31/module.xml b/runtime/j9vm31/module.xml index b8fceb50011..8ff11d2866f 100644 --- a/runtime/j9vm31/module.xml +++ b/runtime/j9vm31/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/CMakeLists.txt b/runtime/jcl/CMakeLists.txt index 4e1e9281ed7..39f7fcf9d4d 100644 --- a/runtime/jcl/CMakeLists.txt +++ b/runtime/jcl/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(J9VM_JCL_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/runtime/jcl/common/acccont.c b/runtime/jcl/common/acccont.c index 4e4a9564e99..a74735cedf4 100644 --- a/runtime/jcl/common/acccont.c +++ b/runtime/jcl/common/acccont.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/annparser.c b/runtime/jcl/common/annparser.c index 4fb229c6c49..b045cefeffd 100644 --- a/runtime/jcl/common/annparser.c +++ b/runtime/jcl/common/annparser.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/attach.c b/runtime/jcl/common/attach.c index 23cd0290c9a..278588761bb 100644 --- a/runtime/jcl/common/attach.c +++ b/runtime/jcl/common/attach.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/jcl/common/bootstrp.c b/runtime/jcl/common/bootstrp.c index 9b573ceb947..faa39015cfc 100644 --- a/runtime/jcl/common/bootstrp.c +++ b/runtime/jcl/common/bootstrp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/bpinit.c b/runtime/jcl/common/bpinit.c index cd0fec54356..a05b3ed0723 100644 --- a/runtime/jcl/common/bpinit.c +++ b/runtime/jcl/common/bpinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/clsldr.cpp b/runtime/jcl/common/clsldr.cpp index 4b89d752f37..ffd03af4ca0 100644 --- a/runtime/jcl/common/clsldr.cpp +++ b/runtime/jcl/common/clsldr.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ArrayCopyHelpers.hpp" #include "VMHelpers.hpp" diff --git a/runtime/jcl/common/com_ibm_jvm_Stats.c b/runtime/jcl/common/com_ibm_jvm_Stats.c index bb6c5edf94b..1495dbe06c2 100644 --- a/runtime/jcl/common/com_ibm_jvm_Stats.c +++ b/runtime/jcl/common/com_ibm_jvm_Stats.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/com_ibm_oti_vm_VM.c b/runtime/jcl/common/com_ibm_oti_vm_VM.c index cf20fe22d07..f95167d66d6 100644 --- a/runtime/jcl/common/com_ibm_oti_vm_VM.c +++ b/runtime/jcl/common/com_ibm_oti_vm_VM.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/compiler.c b/runtime/jcl/common/compiler.c index f22f38eda5f..48f767c6892 100644 --- a/runtime/jcl/common/compiler.c +++ b/runtime/jcl/common/compiler.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jcl/common/criu.cpp b/runtime/jcl/common/criu.cpp index d57bca00d8d..f08919d17e2 100644 --- a/runtime/jcl/common/criu.cpp +++ b/runtime/jcl/common/criu.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/dump.c b/runtime/jcl/common/dump.c index 566e682899a..727c0c83b0d 100644 --- a/runtime/jcl/common/dump.c +++ b/runtime/jcl/common/dump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/exhelp.c b/runtime/jcl/common/exhelp.c index b04d68aa303..dbb432391bb 100644 --- a/runtime/jcl/common/exhelp.c +++ b/runtime/jcl/common/exhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" #include "jni.h" diff --git a/runtime/jcl/common/extendedosmbean.c b/runtime/jcl/common/extendedosmbean.c index 9ca33c6294b..66c88379428 100644 --- a/runtime/jcl/common/extendedosmbean.c +++ b/runtime/jcl/common/extendedosmbean.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/getstacktrace.c b/runtime/jcl/common/getstacktrace.c index b3e0143b60d..8609324117c 100644 --- a/runtime/jcl/common/getstacktrace.c +++ b/runtime/jcl/common/getstacktrace.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/gpu.c b/runtime/jcl/common/gpu.c index b97f06839f2..f3c559cb954 100644 --- a/runtime/jcl/common/gpu.c +++ b/runtime/jcl/common/gpu.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/iohelp.c b/runtime/jcl/common/iohelp.c index e6c36e76c1a..08e2d90fd6d 100644 --- a/runtime/jcl/common/iohelp.c +++ b/runtime/jcl/common/iohelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "iohelp.h" diff --git a/runtime/jcl/common/iohelp.h b/runtime/jcl/common/iohelp.h index 360bddbf2ea..dc1ba41171a 100644 --- a/runtime/jcl/common/iohelp.h +++ b/runtime/jcl/common/iohelp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef iohelp_h #define iohelp_h diff --git a/runtime/jcl/common/java_dyn_methodhandle.c b/runtime/jcl/common/java_dyn_methodhandle.c index 665cf08b5c1..f93c2db8c05 100644 --- a/runtime/jcl/common/java_dyn_methodhandle.c +++ b/runtime/jcl/common/java_dyn_methodhandle.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/java_dyn_methodtype.c b/runtime/jcl/common/java_dyn_methodtype.c index 99402871f06..e01921d5043 100644 --- a/runtime/jcl/common/java_dyn_methodtype.c +++ b/runtime/jcl/common/java_dyn_methodtype.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/java_lang_Access.c b/runtime/jcl/common/java_lang_Access.c index 30bf820acb1..18611e9923d 100644 --- a/runtime/jcl/common/java_lang_Access.c +++ b/runtime/jcl/common/java_lang_Access.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/java_lang_Class.cpp b/runtime/jcl/common/java_lang_Class.cpp index 2e9ba98be6e..0ba447784b5 100644 --- a/runtime/jcl/common/java_lang_Class.cpp +++ b/runtime/jcl/common/java_lang_Class.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/java_lang_Class.h b/runtime/jcl/common/java_lang_Class.h index 447c9b92bed..ca1c3a2e5bd 100644 --- a/runtime/jcl/common/java_lang_Class.h +++ b/runtime/jcl/common/java_lang_Class.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef java_lang_Class_h #define java_lang_Class_h diff --git a/runtime/jcl/common/java_lang_J9VMInternals.cpp b/runtime/jcl/common/java_lang_J9VMInternals.cpp index 230f4683e39..bc49e238a4b 100644 --- a/runtime/jcl/common/java_lang_J9VMInternals.cpp +++ b/runtime/jcl/common/java_lang_J9VMInternals.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/java_lang_Object.c b/runtime/jcl/common/java_lang_Object.c index 4dfeb1ee264..6471d7a9322 100644 --- a/runtime/jcl/common/java_lang_Object.c +++ b/runtime/jcl/common/java_lang_Object.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/java_lang_StackWalker.cpp b/runtime/jcl/common/java_lang_StackWalker.cpp index 9b376a6ae4c..c840e73bd8f 100644 --- a/runtime/jcl/common/java_lang_StackWalker.cpp +++ b/runtime/jcl/common/java_lang_StackWalker.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/java_lang_System.c b/runtime/jcl/common/java_lang_System.c index 0bec0ea1236..0cb494f0e2d 100644 --- a/runtime/jcl/common/java_lang_System.c +++ b/runtime/jcl/common/java_lang_System.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp b/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp index 4ac4ae5993b..00c034c4741 100644 --- a/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp +++ b/runtime/jcl/common/java_lang_invoke_MethodHandleNatives.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jcl/common/java_lang_invoke_VarHandle.c b/runtime/jcl/common/java_lang_invoke_VarHandle.c index 16ba9175f21..a867072f53a 100644 --- a/runtime/jcl/common/java_lang_invoke_VarHandle.c +++ b/runtime/jcl/common/java_lang_invoke_VarHandle.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jclprots.h" diff --git a/runtime/jcl/common/java_lang_ref_Finalizer.c b/runtime/jcl/common/java_lang_ref_Finalizer.c index 200979bae24..faa83f40012 100644 --- a/runtime/jcl/common/java_lang_ref_Finalizer.c +++ b/runtime/jcl/common/java_lang_ref_Finalizer.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/java_lang_ref_Reference.cpp b/runtime/jcl/common/java_lang_ref_Reference.cpp index fa8296e357f..bd4f50bddda 100644 --- a/runtime/jcl/common/java_lang_ref_Reference.cpp +++ b/runtime/jcl/common/java_lang_ref_Reference.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/jclcinit.c b/runtime/jcl/common/jclcinit.c index a736d75dd0a..cc37551a147 100644 --- a/runtime/jcl/common/jclcinit.c +++ b/runtime/jcl/common/jclcinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/jcldefine.c b/runtime/jcl/common/jcldefine.c index b59a5405f80..a115953c79b 100644 --- a/runtime/jcl/common/jcldefine.c +++ b/runtime/jcl/common/jcldefine.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jcl/common/jclexception.cpp b/runtime/jcl/common/jclexception.cpp index 00b387fc141..eec34144aca 100644 --- a/runtime/jcl/common/jclexception.cpp +++ b/runtime/jcl/common/jclexception.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j2sever.h" diff --git a/runtime/jcl/common/jclexception.h b/runtime/jcl/common/jclexception.h index 44d0f98faf4..b7885b557f5 100644 --- a/runtime/jcl/common/jclexception.h +++ b/runtime/jcl/common/jclexception.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jclexception_h #define jclexception_h diff --git a/runtime/jcl/common/jclglob.c b/runtime/jcl/common/jclglob.c index b1b1003614b..5eb00ef3f54 100644 --- a/runtime/jcl/common/jclglob.c +++ b/runtime/jcl/common/jclglob.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/jcl/common/jclglob.h b/runtime/jcl/common/jclglob.h index f0aef79b3f6..015ab158750 100644 --- a/runtime/jcl/common/jclglob.h +++ b/runtime/jcl/common/jclglob.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jclglob_h #define jclglob_h diff --git a/runtime/jcl/common/jclreflect.c b/runtime/jcl/common/jclreflect.c index f6231b36ef1..9746698941f 100644 --- a/runtime/jcl/common/jclreflect.c +++ b/runtime/jcl/common/jclreflect.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jcl/common/jcltrace.c b/runtime/jcl/common/jcltrace.c index cb2dbbd6d44..833fba6a33e 100644 --- a/runtime/jcl/common/jcltrace.c +++ b/runtime/jcl/common/jcltrace.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/jcltrace.h b/runtime/jcl/common/jcltrace.h index bf8892b7450..ddb9dc2f5ea 100644 --- a/runtime/jcl/common/jcltrace.h +++ b/runtime/jcl/common/jcltrace.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef trace_h #define trace_h diff --git a/runtime/jcl/common/jclvm.c b/runtime/jcl/common/jclvm.c index 915db97cde1..39666a9ddd2 100644 --- a/runtime/jcl/common/jclvm.c +++ b/runtime/jcl/common/jclvm.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/jdk_internal_foreign_abi_UpcallStubs.cpp b/runtime/jcl/common/jdk_internal_foreign_abi_UpcallStubs.cpp index f835b7ac6a6..c3165825ee8 100644 --- a/runtime/jcl/common/jdk_internal_foreign_abi_UpcallStubs.cpp +++ b/runtime/jcl/common/jdk_internal_foreign_abi_UpcallStubs.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/jcl/common/jdk_internal_misc_ScopedMemoryAccess.cpp b/runtime/jcl/common/jdk_internal_misc_ScopedMemoryAccess.cpp index df18f4a2f36..855b6373127 100644 --- a/runtime/jcl/common/jdk_internal_misc_ScopedMemoryAccess.cpp +++ b/runtime/jcl/common/jdk_internal_misc_ScopedMemoryAccess.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/jdk_internal_vm_Continuation.cpp b/runtime/jcl/common/jdk_internal_vm_Continuation.cpp index 46c37283e6c..37029a58946 100644 --- a/runtime/jcl/common/jdk_internal_vm_Continuation.cpp +++ b/runtime/jcl/common/jdk_internal_vm_Continuation.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/jithelpers.c b/runtime/jcl/common/jithelpers.c index 747dbce94a4..7ef74a2de76 100644 --- a/runtime/jcl/common/jithelpers.c +++ b/runtime/jcl/common/jithelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/jniidcacheinit.c b/runtime/jcl/common/jniidcacheinit.c index 96fcc259137..69e2f4ed892 100644 --- a/runtime/jcl/common/jniidcacheinit.c +++ b/runtime/jcl/common/jniidcacheinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jclglob.h" #include diff --git a/runtime/jcl/common/jniidcacheinit.h b/runtime/jcl/common/jniidcacheinit.h index 4cda50d53ea..2b2940921dc 100644 --- a/runtime/jcl/common/jniidcacheinit.h +++ b/runtime/jcl/common/jniidcacheinit.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JNIIDCACHEINIT_H_ #define JNIIDCACHEINIT_H_ diff --git a/runtime/jcl/common/log.c b/runtime/jcl/common/log.c index c0b4d282577..c4d34e32003 100644 --- a/runtime/jcl/common/log.c +++ b/runtime/jcl/common/log.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtclassloading.c b/runtime/jcl/common/mgmtclassloading.c index cdecc6f2177..2a939e03af5 100644 --- a/runtime/jcl/common/mgmtclassloading.c +++ b/runtime/jcl/common/mgmtclassloading.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtcompilation.c b/runtime/jcl/common/mgmtcompilation.c index b9e012bd559..85aab67e8a4 100644 --- a/runtime/jcl/common/mgmtcompilation.c +++ b/runtime/jcl/common/mgmtcompilation.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtgc.c b/runtime/jcl/common/mgmtgc.c index cedc38fda78..96b74ab4668 100644 --- a/runtime/jcl/common/mgmtgc.c +++ b/runtime/jcl/common/mgmtgc.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmthypervisor.c b/runtime/jcl/common/mgmthypervisor.c index 92c3214536c..383845c47ee 100644 --- a/runtime/jcl/common/mgmthypervisor.c +++ b/runtime/jcl/common/mgmthypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/mgmtinit.c b/runtime/jcl/common/mgmtinit.c index a0e0b4ebf68..5673bb4139f 100644 --- a/runtime/jcl/common/mgmtinit.c +++ b/runtime/jcl/common/mgmtinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtinit.h b/runtime/jcl/common/mgmtinit.h index 7381f725694..3580c250037 100644 --- a/runtime/jcl/common/mgmtinit.h +++ b/runtime/jcl/common/mgmtinit.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef mgmtinit_h #define mgmtinit_h diff --git a/runtime/jcl/common/mgmtmemmgr.c b/runtime/jcl/common/mgmtmemmgr.c index b85462357c3..49cdbf1abd1 100644 --- a/runtime/jcl/common/mgmtmemmgr.c +++ b/runtime/jcl/common/mgmtmemmgr.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtmemory.c b/runtime/jcl/common/mgmtmemory.c index 81b94ed42d2..c3aba6caa13 100644 --- a/runtime/jcl/common/mgmtmemory.c +++ b/runtime/jcl/common/mgmtmemory.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtmempool.c b/runtime/jcl/common/mgmtmempool.c index d6530604619..0b83a1e7413 100644 --- a/runtime/jcl/common/mgmtmempool.c +++ b/runtime/jcl/common/mgmtmempool.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtos.c b/runtime/jcl/common/mgmtos.c index e51fa218445..5a4fc95db6e 100644 --- a/runtime/jcl/common/mgmtos.c +++ b/runtime/jcl/common/mgmtos.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtosext.c b/runtime/jcl/common/mgmtosext.c index 6ec44ef2c73..15cb77a373a 100644 --- a/runtime/jcl/common/mgmtosext.c +++ b/runtime/jcl/common/mgmtosext.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtruntime.c b/runtime/jcl/common/mgmtruntime.c index 6ef8a21dee3..0174b29aab9 100644 --- a/runtime/jcl/common/mgmtruntime.c +++ b/runtime/jcl/common/mgmtruntime.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/mgmtthread.c b/runtime/jcl/common/mgmtthread.c index 56d4133d78a..8b9b7087ccc 100644 --- a/runtime/jcl/common/mgmtthread.c +++ b/runtime/jcl/common/mgmtthread.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/jcl/common/module.xml b/runtime/jcl/common/module.xml index d228f586883..9dcfc2604b3 100644 --- a/runtime/jcl/common/module.xml +++ b/runtime/jcl/common/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/common/orbvmhelpers.c b/runtime/jcl/common/orbvmhelpers.c index ae53075df21..dd7a10e5ce7 100644 --- a/runtime/jcl/common/orbvmhelpers.c +++ b/runtime/jcl/common/orbvmhelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/proxy.c b/runtime/jcl/common/proxy.c index d6afc982270..3c1c05258d1 100644 --- a/runtime/jcl/common/proxy.c +++ b/runtime/jcl/common/proxy.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "iohelp.h" #include "jclglob.h" diff --git a/runtime/jcl/common/raw_java_lang_J9VMInternals.c b/runtime/jcl/common/raw_java_lang_J9VMInternals.c index 27461c41f92..c8b72410f12 100644 --- a/runtime/jcl/common/raw_java_lang_J9VMInternals.c +++ b/runtime/jcl/common/raw_java_lang_J9VMInternals.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/reflecthelp.c b/runtime/jcl/common/reflecthelp.c index ebb26302510..776978b5c50 100644 --- a/runtime/jcl/common/reflecthelp.c +++ b/runtime/jcl/common/reflecthelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j2sever.h" diff --git a/runtime/jcl/common/shared.c b/runtime/jcl/common/shared.c index 5d724145e5b..ecca1577349 100644 --- a/runtime/jcl/common/shared.c +++ b/runtime/jcl/common/shared.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/sigquit.c b/runtime/jcl/common/sigquit.c index 02c1e7caebb..e0fcaf8543f 100644 --- a/runtime/jcl/common/sigquit.c +++ b/runtime/jcl/common/sigquit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9user.h" diff --git a/runtime/jcl/common/sigusr2.c b/runtime/jcl/common/sigusr2.c index 0bdd75ce530..b99f37a35a9 100644 --- a/runtime/jcl/common/sigusr2.c +++ b/runtime/jcl/common/sigusr2.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9user.h" diff --git a/runtime/jcl/common/stdinit.c b/runtime/jcl/common/stdinit.c index 0aaaa54c437..45a902ebea3 100644 --- a/runtime/jcl/common/stdinit.c +++ b/runtime/jcl/common/stdinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/sun_misc_Perf.c b/runtime/jcl/common/sun_misc_Perf.c index 56c4f5d57e4..d51d7092478 100644 --- a/runtime/jcl/common/sun_misc_Perf.c +++ b/runtime/jcl/common/sun_misc_Perf.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/sun_misc_URLClassPath.c b/runtime/jcl/common/sun_misc_URLClassPath.c index ca42d5703d0..3eb0cf63c72 100644 --- a/runtime/jcl/common/sun_misc_URLClassPath.c +++ b/runtime/jcl/common/sun_misc_URLClassPath.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/sun_misc_Unsafe.cpp b/runtime/jcl/common/sun_misc_Unsafe.cpp index b39d7070441..e5f533030d8 100644 --- a/runtime/jcl/common/sun_misc_Unsafe.cpp +++ b/runtime/jcl/common/sun_misc_Unsafe.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jcl/common/sun_reflect_ConstantPool.c b/runtime/jcl/common/sun_reflect_ConstantPool.c index 6764c230a07..e05067e6ea8 100644 --- a/runtime/jcl/common/sun_reflect_ConstantPool.c +++ b/runtime/jcl/common/sun_reflect_ConstantPool.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jcl/common/system.c b/runtime/jcl/common/system.c index 6575675ad48..fde6411f43e 100644 --- a/runtime/jcl/common/system.c +++ b/runtime/jcl/common/system.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/jcl/common/thread.cpp b/runtime/jcl/common/thread.cpp index 4f8c737dbf7..7880111ae3f 100644 --- a/runtime/jcl/common/thread.cpp +++ b/runtime/jcl/common/thread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/jcl/common/unsafe_mem.c b/runtime/jcl/common/unsafe_mem.c index f57d9778b1a..a433232a436 100644 --- a/runtime/jcl/common/unsafe_mem.c +++ b/runtime/jcl/common/unsafe_mem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "jclprots.h" diff --git a/runtime/jcl/common/vectornatives.cpp b/runtime/jcl/common/vectornatives.cpp index 73789401470..c15bc60ac02 100644 --- a/runtime/jcl/common/vectornatives.cpp +++ b/runtime/jcl/common/vectornatives.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "jclprots.h" diff --git a/runtime/jcl/common/vm_scar.c b/runtime/jcl/common/vm_scar.c index e6f01514184..4e19b36fc47 100644 --- a/runtime/jcl/common/vm_scar.c +++ b/runtime/jcl/common/vm_scar.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/common/vminternals.c b/runtime/jcl/common/vminternals.c index e2c004e34b6..0f5546bb628 100644 --- a/runtime/jcl/common/vminternals.c +++ b/runtime/jcl/common/vminternals.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" #include "j9.h" diff --git a/runtime/jcl/exports.cmake b/runtime/jcl/exports.cmake index 4fa51f66109..2e97929e400 100644 --- a/runtime/jcl/exports.cmake +++ b/runtime/jcl/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_exports(jclse diff --git a/runtime/jcl/filesys/vmfilesys.c b/runtime/jcl/filesys/vmfilesys.c index 0024ce03e4a..dfdb7754e84 100644 --- a/runtime/jcl/filesys/vmfilesys.c +++ b/runtime/jcl/filesys/vmfilesys.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jcl.h" diff --git a/runtime/jcl/j9jcl.tdf b/runtime/jcl/j9jcl.tdf index 69ae244a805..3f5aef123c1 100644 --- a/runtime/jcl/j9jcl.tdf +++ b/runtime/jcl/j9jcl.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9jcl Submodules=j9vmutil,j9util,pool diff --git a/runtime/jcl/jcl_internal.h b/runtime/jcl/jcl_internal.h index 70cabdcecc6..845e4bc3464 100644 --- a/runtime/jcl/jcl_internal.h +++ b/runtime/jcl/jcl_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Prototypes and types required by the JCL module */ diff --git a/runtime/jcl/module.xml b/runtime/jcl/module.xml index 7457c4b8484..08356f33007 100644 --- a/runtime/jcl/module.xml +++ b/runtime/jcl/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/natives.lst.ftl b/runtime/jcl/natives.lst.ftl index dc32921be8f..3bec5800265 100644 --- a/runtime/jcl/natives.lst.ftl +++ b/runtime/jcl/natives.lst.ftl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # <#list uma.spec.artifacts as artifact> diff --git a/runtime/jcl/uma/attach_exports.xml b/runtime/jcl/uma/attach_exports.xml index 9a6f14e2d3d..c589d435293 100644 --- a/runtime/jcl/uma/attach_exports.xml +++ b/runtime/jcl/uma/attach_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/attach_objects.xml b/runtime/jcl/uma/attach_objects.xml index 597850c0328..e46e4ea0570 100644 --- a/runtime/jcl/uma/attach_objects.xml +++ b/runtime/jcl/uma/attach_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/criu_exports.xml b/runtime/jcl/uma/criu_exports.xml index 2e655efc193..83960e0254e 100644 --- a/runtime/jcl/uma/criu_exports.xml +++ b/runtime/jcl/uma/criu_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/criu_objects.xml b/runtime/jcl/uma/criu_objects.xml index e94dd8789be..dbed4ace860 100644 --- a/runtime/jcl/uma/criu_objects.xml +++ b/runtime/jcl/uma/criu_objects.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/java_dyn_methodhandle_exports.xml b/runtime/jcl/uma/java_dyn_methodhandle_exports.xml index 1ca6d895ab8..0005ce746c5 100644 --- a/runtime/jcl/uma/java_dyn_methodhandle_exports.xml +++ b/runtime/jcl/uma/java_dyn_methodhandle_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/java_dyn_methodhandle_objects.xml b/runtime/jcl/uma/java_dyn_methodhandle_objects.xml index 4def3aa564a..e38e3f21f9a 100644 --- a/runtime/jcl/uma/java_dyn_methodhandle_objects.xml +++ b/runtime/jcl/uma/java_dyn_methodhandle_objects.xml @@ -13,7 +13,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_exports.xml b/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_exports.xml index 096fb1d3119..6c93362c8cc 100644 --- a/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_exports.xml +++ b/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_exports.xml @@ -16,7 +16,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_objects.xml b/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_objects.xml index a2fc8e0d7fd..f987a68b748 100644 --- a/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_objects.xml +++ b/runtime/jcl/uma/java_lang_invoke_MethodHandleNatives_objects.xml @@ -13,7 +13,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/jithelpers_jni_exports.xml b/runtime/jcl/uma/jithelpers_jni_exports.xml index e7ea6688b5b..bd3012fb6d5 100644 --- a/runtime/jcl/uma/jithelpers_jni_exports.xml +++ b/runtime/jcl/uma/jithelpers_jni_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/jithelpers_objects.xml b/runtime/jcl/uma/jithelpers_objects.xml index 1255b978c45..bbc00a5ff1b 100644 --- a/runtime/jcl/uma/jithelpers_objects.xml +++ b/runtime/jcl/uma/jithelpers_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/readme.txt b/runtime/jcl/uma/readme.txt index e5049104c5f..b688fecf118 100644 --- a/runtime/jcl/uma/readme.txt +++ b/runtime/jcl/uma/readme.txt @@ -16,6 +16,6 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 This directory contains UMA metadata files that are shared between multiple configurations. \ No newline at end of file diff --git a/runtime/jcl/uma/se11_exports.xml b/runtime/jcl/uma/se11_exports.xml index 2f618b2f970..626a197be7a 100644 --- a/runtime/jcl/uma/se11_exports.xml +++ b/runtime/jcl/uma/se11_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se14_exports.xml b/runtime/jcl/uma/se14_exports.xml index 410e981c336..cf55bfdb8ee 100644 --- a/runtime/jcl/uma/se14_exports.xml +++ b/runtime/jcl/uma/se14_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se15_exports.xml b/runtime/jcl/uma/se15_exports.xml index 7202c981316..94a89b34348 100644 --- a/runtime/jcl/uma/se15_exports.xml +++ b/runtime/jcl/uma/se15_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se16_exports.xml b/runtime/jcl/uma/se16_exports.xml index 1844691b4cb..2eda530ed14 100644 --- a/runtime/jcl/uma/se16_exports.xml +++ b/runtime/jcl/uma/se16_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se16_objects.xml b/runtime/jcl/uma/se16_objects.xml index 223c6d5c84a..a97b9e77c60 100644 --- a/runtime/jcl/uma/se16_objects.xml +++ b/runtime/jcl/uma/se16_objects.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se19_exports.xml b/runtime/jcl/uma/se19_exports.xml index d41deef2571..c7a0ef512dc 100644 --- a/runtime/jcl/uma/se19_exports.xml +++ b/runtime/jcl/uma/se19_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se19_objects.xml b/runtime/jcl/uma/se19_objects.xml index d61e6ae077a..d02eb7413b0 100644 --- a/runtime/jcl/uma/se19_objects.xml +++ b/runtime/jcl/uma/se19_objects.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se19only_exports.xml b/runtime/jcl/uma/se19only_exports.xml index 7389bc8d94e..830d1adf8ee 100644 --- a/runtime/jcl/uma/se19only_exports.xml +++ b/runtime/jcl/uma/se19only_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se20_exports.xml b/runtime/jcl/uma/se20_exports.xml index c66946ea3d3..f20df84b552 100644 --- a/runtime/jcl/uma/se20_exports.xml +++ b/runtime/jcl/uma/se20_exports.xml @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se626_orb_ludcl_exports.xml b/runtime/jcl/uma/se626_orb_ludcl_exports.xml index e2daa6ec7ef..d175f7fb499 100644 --- a/runtime/jcl/uma/se626_orb_ludcl_exports.xml +++ b/runtime/jcl/uma/se626_orb_ludcl_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se626_orb_ludcl_objects.xml b/runtime/jcl/uma/se626_orb_ludcl_objects.xml index ddfbdd200f9..5089ccf7f4e 100644 --- a/runtime/jcl/uma/se626_orb_ludcl_objects.xml +++ b/runtime/jcl/uma/se626_orb_ludcl_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se6_vm-side_lifecycle_exports.xml b/runtime/jcl/uma/se6_vm-side_lifecycle_exports.xml index 4c9949b59ba..475ddde6422 100644 --- a/runtime/jcl/uma/se6_vm-side_lifecycle_exports.xml +++ b/runtime/jcl/uma/se6_vm-side_lifecycle_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se6_vm-side_lifecycle_objects.xml b/runtime/jcl/uma/se6_vm-side_lifecycle_objects.xml index c7ff203a884..e0fe50d2dee 100644 --- a/runtime/jcl/uma/se6_vm-side_lifecycle_objects.xml +++ b/runtime/jcl/uma/se6_vm-side_lifecycle_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se6_vm-side_natives_exports.xml b/runtime/jcl/uma/se6_vm-side_natives_exports.xml index a9e1d86d282..8af027a2e51 100644 --- a/runtime/jcl/uma/se6_vm-side_natives_exports.xml +++ b/runtime/jcl/uma/se6_vm-side_natives_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se6_vm-side_natives_objects.xml b/runtime/jcl/uma/se6_vm-side_natives_objects.xml index 0acc9906c49..07384f71287 100644 --- a/runtime/jcl/uma/se6_vm-side_natives_objects.xml +++ b/runtime/jcl/uma/se6_vm-side_natives_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se7_exports.xml b/runtime/jcl/uma/se7_exports.xml index 88cda91f7e7..25289847126 100644 --- a/runtime/jcl/uma/se7_exports.xml +++ b/runtime/jcl/uma/se7_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se7_objects.xml b/runtime/jcl/uma/se7_objects.xml index 01a30b3d6d0..b512205d4b3 100644 --- a/runtime/jcl/uma/se7_objects.xml +++ b/runtime/jcl/uma/se7_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se829_exports.xml b/runtime/jcl/uma/se829_exports.xml index c365695dd3a..7faae29570f 100644 --- a/runtime/jcl/uma/se829_exports.xml +++ b/runtime/jcl/uma/se829_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se8_exports.xml b/runtime/jcl/uma/se8_exports.xml index d50f518a2ab..6cbaab72211 100644 --- a/runtime/jcl/uma/se8_exports.xml +++ b/runtime/jcl/uma/se8_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se8_objects.xml b/runtime/jcl/uma/se8_objects.xml index a1982ae50a1..31c45cd379d 100644 --- a/runtime/jcl/uma/se8_objects.xml +++ b/runtime/jcl/uma/se8_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se8only_exports.xml b/runtime/jcl/uma/se8only_exports.xml index 2099000ff0e..c5e3b755dab 100644 --- a/runtime/jcl/uma/se8only_exports.xml +++ b/runtime/jcl/uma/se8only_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se8only_objects.xml b/runtime/jcl/uma/se8only_objects.xml index 2e48d9dc7b4..184aceab5e7 100644 --- a/runtime/jcl/uma/se8only_objects.xml +++ b/runtime/jcl/uma/se8only_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se9_exports.xml b/runtime/jcl/uma/se9_exports.xml index c59a0cf450b..a33c6a18c9d 100644 --- a/runtime/jcl/uma/se9_exports.xml +++ b/runtime/jcl/uma/se9_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/se9_objects.xml b/runtime/jcl/uma/se9_objects.xml index a46a375878c..f4e238d8295 100644 --- a/runtime/jcl/uma/se9_objects.xml +++ b/runtime/jcl/uma/se9_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/sun_misc_Unsafe_exports.xml b/runtime/jcl/uma/sun_misc_Unsafe_exports.xml index 9f7a7e5aec7..134601a8181 100644 --- a/runtime/jcl/uma/sun_misc_Unsafe_exports.xml +++ b/runtime/jcl/uma/sun_misc_Unsafe_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/sun_misc_Unsafe_objects.xml b/runtime/jcl/uma/sun_misc_Unsafe_objects.xml index bfa0be7e6d5..9906164154f 100644 --- a/runtime/jcl/uma/sun_misc_Unsafe_objects.xml +++ b/runtime/jcl/uma/sun_misc_Unsafe_objects.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/unsafemem_inl_exports.xml b/runtime/jcl/uma/unsafemem_inl_exports.xml index 9f8895fb19b..0630b29d979 100644 --- a/runtime/jcl/uma/unsafemem_inl_exports.xml +++ b/runtime/jcl/uma/unsafemem_inl_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/unsafemem_jni_exports.xml b/runtime/jcl/uma/unsafemem_jni_exports.xml index 4e47001ac08..22d2ba4a012 100644 --- a/runtime/jcl/uma/unsafemem_jni_exports.xml +++ b/runtime/jcl/uma/unsafemem_jni_exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/uma/vendor_jcl_default.xml b/runtime/jcl/uma/vendor_jcl_default.xml index 5e5b32dcc75..05640f56d79 100644 --- a/runtime/jcl/uma/vendor_jcl_default.xml +++ b/runtime/jcl/uma/vendor_jcl_default.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jcl/unix/syshelp.c b/runtime/jcl/unix/syshelp.c index d5cab94367d..b887043162f 100644 --- a/runtime/jcl/unix/syshelp.c +++ b/runtime/jcl/unix/syshelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jcl/win32/syshelp.c b/runtime/jcl/win32/syshelp.c index e5f8d621e25..0a75fc893a0 100644 --- a/runtime/jcl/win32/syshelp.c +++ b/runtime/jcl/win32/syshelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Undefine the winsockapi because winsock2 defines it. Removes warnings. */ #if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_) diff --git a/runtime/jextractnatives/CMakeLists.txt b/runtime/jextractnatives/CMakeLists.txt index 64663c58970..f1989657fd0 100644 --- a/runtime/jextractnatives/CMakeLists.txt +++ b/runtime/jextractnatives/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/jextractnatives/jextractglue.c b/runtime/jextractnatives/jextractglue.c index 6b08c31e9ef..bbf30de2915 100644 --- a/runtime/jextractnatives/jextractglue.c +++ b/runtime/jextractnatives/jextractglue.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9dbgext.h" diff --git a/runtime/jextractnatives/jextractnatives.c b/runtime/jextractnatives/jextractnatives.c index 36d282eeeec..5954db11951 100644 --- a/runtime/jextractnatives/jextractnatives.c +++ b/runtime/jextractnatives/jextractnatives.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jextractnatives/jextractnatives_internal.h b/runtime/jextractnatives/jextractnatives_internal.h index 885b4a4a23c..0219b0cae9e 100644 --- a/runtime/jextractnatives/jextractnatives_internal.h +++ b/runtime/jextractnatives/jextractnatives_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jextractnatives_internal_h diff --git a/runtime/jextractnatives/module.xml b/runtime/jextractnatives/module.xml index 93bae63866e..690b206a9e0 100644 --- a/runtime/jextractnatives/module.xml +++ b/runtime/jextractnatives/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jilgen/CMakeLists.txt b/runtime/jilgen/CMakeLists.txt index f69933d831f..ef7bc4edecf 100644 --- a/runtime/jilgen/CMakeLists.txt +++ b/runtime/jilgen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(OMR_OS_AIX) diff --git a/runtime/jilgen/jilconsts.c b/runtime/jilgen/jilconsts.c index aaea4f360b1..c39b52346fc 100644 --- a/runtime/jilgen/jilconsts.c +++ b/runtime/jilgen/jilconsts.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jilgen/module.xml b/runtime/jilgen/module.xml index c86b34de168..f46b7aabd4d 100644 --- a/runtime/jilgen/module.xml +++ b/runtime/jilgen/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jit_vm/CMakeLists.txt b/runtime/jit_vm/CMakeLists.txt index f12bba3a720..bf8108db1d9 100644 --- a/runtime/jit_vm/CMakeLists.txt +++ b/runtime/jit_vm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/jit_vm/artifact.c b/runtime/jit_vm/artifact.c index 323716d5338..58fb62e56e6 100644 --- a/runtime/jit_vm/artifact.c +++ b/runtime/jit_vm/artifact.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jit_vm/cthelpers.cpp b/runtime/jit_vm/cthelpers.cpp index 15eca4e4547..42e0b5b8d6f 100644 --- a/runtime/jit_vm/cthelpers.cpp +++ b/runtime/jit_vm/cthelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jit_vm/ctsupport.cpp b/runtime/jit_vm/ctsupport.cpp index cc30f0f867a..18ad1a59661 100644 --- a/runtime/jit_vm/ctsupport.cpp +++ b/runtime/jit_vm/ctsupport.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/jit_vm/module.xml b/runtime/jit_vm/module.xml index 6ba5bd7f3c8..410dac13d79 100644 --- a/runtime/jit_vm/module.xml +++ b/runtime/jit_vm/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jitserver_launcher/CMakeLists.txt b/runtime/jitserver_launcher/CMakeLists.txt index 5f8d91124b3..00124288219 100644 --- a/runtime/jitserver_launcher/CMakeLists.txt +++ b/runtime/jitserver_launcher/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(jitserver diff --git a/runtime/jitserver_launcher/jitserver.c b/runtime/jitserver_launcher/jitserver.c index 0fa9f2e02e2..3c2dde53248 100644 --- a/runtime/jitserver_launcher/jitserver.c +++ b/runtime/jitserver_launcher/jitserver.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(LINUX) || defined(J9ZTPF) || defined(J9ARM) || defined(J9AARCH64) diff --git a/runtime/jitserver_launcher/module.xml b/runtime/jitserver_launcher/module.xml index 478479563dd..8a9a4b29c4f 100644 --- a/runtime/jitserver_launcher/module.xml +++ b/runtime/jitserver_launcher/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jnichk/CMakeLists.txt b/runtime/jnichk/CMakeLists.txt index 6a2f838c033..b9269fe388d 100644 --- a/runtime/jnichk/CMakeLists.txt +++ b/runtime/jnichk/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/jnichk/j9jni.tdf b/runtime/jnichk/j9jni.tdf index f0f9b941920..a07e36cec96 100644 --- a/runtime/jnichk/j9jni.tdf +++ b/runtime/jnichk/j9jni.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9jni DATFileName=J9TraceFormat.dat diff --git a/runtime/jnichk/jnicbuf.c b/runtime/jnichk/jnicbuf.c index c489ce52597..bc1ae1ac83e 100644 --- a/runtime/jnichk/jnicbuf.c +++ b/runtime/jnichk/jnicbuf.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jnichk/jnicheck.c b/runtime/jnichk/jnicheck.c index da67d944722..698a900414f 100644 --- a/runtime/jnichk/jnicheck.c +++ b/runtime/jnichk/jnicheck.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jnichk/jnicheck.h b/runtime/jnichk/jnicheck.h index 39454e54898..4a548830370 100644 --- a/runtime/jnichk/jnicheck.h +++ b/runtime/jnichk/jnicheck.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jnicheck_h diff --git a/runtime/jnichk/jnichk_internal.h b/runtime/jnichk/jnichk_internal.h index 05fc26bc5e8..f94a32f0c35 100644 --- a/runtime/jnichk/jnichk_internal.h +++ b/runtime/jnichk/jnichk_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jnichk_internal_h diff --git a/runtime/jnichk/jnicmem.c b/runtime/jnichk/jnicmem.c index 2d7c518cec6..1ecad342995 100644 --- a/runtime/jnichk/jnicmem.c +++ b/runtime/jnichk/jnicmem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/jnichk/jnicwrappers.c b/runtime/jnichk/jnicwrappers.c index 434170e8aa2..1c517afd7dd 100644 --- a/runtime/jnichk/jnicwrappers.c +++ b/runtime/jnichk/jnicwrappers.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/jnichk/module.xml b/runtime/jnichk/module.xml index 8f57ba9632f..d8952aa92fb 100644 --- a/runtime/jnichk/module.xml +++ b/runtime/jnichk/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jniinv/CMakeLists.txt b/runtime/jniinv/CMakeLists.txt index f1dbc10b31f..d326f3f4b5a 100644 --- a/runtime/jniinv/CMakeLists.txt +++ b/runtime/jniinv/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/jniinv/jniinv_internal.h b/runtime/jniinv/jniinv_internal.h index 285364c85dc..37ecf4b47d8 100644 --- a/runtime/jniinv/jniinv_internal.h +++ b/runtime/jniinv/jniinv_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jniinv_internal_h diff --git a/runtime/jniinv/main.c b/runtime/jniinv/main.c index 8e61db0d68d..28037e53dc8 100644 --- a/runtime/jniinv/main.c +++ b/runtime/jniinv/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jniinv/module.xml b/runtime/jniinv/module.xml index 561a707e650..c81a065307d 100644 --- a/runtime/jniinv/module.xml +++ b/runtime/jniinv/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jsigWrapper/CMakeLists.txt b/runtime/jsigWrapper/CMakeLists.txt index 4e169d1b955..c0583f9bcd8 100644 --- a/runtime/jsigWrapper/CMakeLists.txt +++ b/runtime/jsigWrapper/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(jsig SHARED diff --git a/runtime/jsigWrapper/jsig.c b/runtime/jsigWrapper/jsig.c index c55e583878a..0963c3031a4 100644 --- a/runtime/jsigWrapper/jsig.c +++ b/runtime/jsigWrapper/jsig.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) diff --git a/runtime/jsigWrapper/jsig.h b/runtime/jsigWrapper/jsig.h index 0e497417055..55632afa2df 100644 --- a/runtime/jsigWrapper/jsig.h +++ b/runtime/jsigWrapper/jsig.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(JSIG_H_) diff --git a/runtime/jsigWrapper/module.xml b/runtime/jsigWrapper/module.xml index 976f0dacd3c..cbebb479ae5 100644 --- a/runtime/jsigWrapper/module.xml +++ b/runtime/jsigWrapper/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jvmti/CMakeLists.txt b/runtime/jvmti/CMakeLists.txt index 8e3299be9fe..a54044e4973 100644 --- a/runtime/jvmti/CMakeLists.txt +++ b/runtime/jvmti/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_tracegen(j9jvmti.tdf) diff --git a/runtime/jvmti/heapify.cpp b/runtime/jvmti/heapify.cpp index 40aaa34fbf7..8ec701be777 100644 --- a/runtime/jvmti/heapify.cpp +++ b/runtime/jvmti/heapify.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/j9jvmti.tdf b/runtime/jvmti/j9jvmti.tdf index 31292525a34..396b51886e3 100644 --- a/runtime/jvmti/j9jvmti.tdf +++ b/runtime/jvmti/j9jvmti.tdf @@ -16,7 +16,7 @@ //[1] https://www.gnu.org/software/classpath/license.html //[2] https://openjdk.org/legal/assembly-exception.html // -//SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +//SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9jvmti Submodules=j9vmutil,j9util,pool diff --git a/runtime/jvmti/jvmtiBreakpoint.c b/runtime/jvmti/jvmtiBreakpoint.c index 5cecc23ad3c..5e2a89e29f6 100644 --- a/runtime/jvmti/jvmtiBreakpoint.c +++ b/runtime/jvmti/jvmtiBreakpoint.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiCapability.c b/runtime/jvmti/jvmtiCapability.c index 9b4c4cab34c..204f920958a 100644 --- a/runtime/jvmti/jvmtiCapability.c +++ b/runtime/jvmti/jvmtiCapability.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiClass.c b/runtime/jvmti/jvmtiClass.c index df82fbc0145..671c1deac54 100644 --- a/runtime/jvmti/jvmtiClass.c +++ b/runtime/jvmti/jvmtiClass.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiClassLoaderSearch.c b/runtime/jvmti/jvmtiClassLoaderSearch.c index 58af76d2c31..9909d1f0522 100644 --- a/runtime/jvmti/jvmtiClassLoaderSearch.c +++ b/runtime/jvmti/jvmtiClassLoaderSearch.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiEventManagement.c b/runtime/jvmti/jvmtiEventManagement.c index 76d9787fa5a..7bee3e1b960 100644 --- a/runtime/jvmti/jvmtiEventManagement.c +++ b/runtime/jvmti/jvmtiEventManagement.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiExtensionMechanism.c b/runtime/jvmti/jvmtiExtensionMechanism.c index ff14dd2e42d..e3fcf35786f 100644 --- a/runtime/jvmti/jvmtiExtensionMechanism.c +++ b/runtime/jvmti/jvmtiExtensionMechanism.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jvmti/jvmtiField.c b/runtime/jvmti/jvmtiField.c index d26f17c77c6..9cb96df1e2c 100644 --- a/runtime/jvmti/jvmtiField.c +++ b/runtime/jvmti/jvmtiField.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiForceEarlyReturn.c b/runtime/jvmti/jvmtiForceEarlyReturn.c index 8151334a313..8024107396b 100644 --- a/runtime/jvmti/jvmtiForceEarlyReturn.c +++ b/runtime/jvmti/jvmtiForceEarlyReturn.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiFunctionTable.c b/runtime/jvmti/jvmtiFunctionTable.c index da89e74b143..ec5fe48fa2e 100644 --- a/runtime/jvmti/jvmtiFunctionTable.c +++ b/runtime/jvmti/jvmtiFunctionTable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiGeneral.c b/runtime/jvmti/jvmtiGeneral.c index de6ed4ba5a3..20446943bbf 100644 --- a/runtime/jvmti/jvmtiGeneral.c +++ b/runtime/jvmti/jvmtiGeneral.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiHeap.c b/runtime/jvmti/jvmtiHeap.c index ebd950f7ee4..376b0c4c3b8 100644 --- a/runtime/jvmti/jvmtiHeap.c +++ b/runtime/jvmti/jvmtiHeap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiHeap10.c b/runtime/jvmti/jvmtiHeap10.c index 01ec0dae9ce..45299b3c305 100644 --- a/runtime/jvmti/jvmtiHeap10.c +++ b/runtime/jvmti/jvmtiHeap10.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiHelpers.c b/runtime/jvmti/jvmtiHelpers.c index 61df8337e8a..c26867e95ae 100644 --- a/runtime/jvmti/jvmtiHelpers.c +++ b/runtime/jvmti/jvmtiHelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiHelpers.h b/runtime/jvmti/jvmtiHelpers.h index 320262330e1..c108fb7085e 100644 --- a/runtime/jvmti/jvmtiHelpers.h +++ b/runtime/jvmti/jvmtiHelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jvmtiHelpers_h diff --git a/runtime/jvmti/jvmtiHook.c b/runtime/jvmti/jvmtiHook.c index d5907354b31..bf2b7b0f247 100644 --- a/runtime/jvmti/jvmtiHook.c +++ b/runtime/jvmti/jvmtiHook.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiJNIFunctionInterception.c b/runtime/jvmti/jvmtiJNIFunctionInterception.c index 5e353ce642e..fc70c31b076 100644 --- a/runtime/jvmti/jvmtiJNIFunctionInterception.c +++ b/runtime/jvmti/jvmtiJNIFunctionInterception.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiLocalVariable.c b/runtime/jvmti/jvmtiLocalVariable.c index 6c36f6d4c05..b2e95e4ee0d 100644 --- a/runtime/jvmti/jvmtiLocalVariable.c +++ b/runtime/jvmti/jvmtiLocalVariable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiMemory.c b/runtime/jvmti/jvmtiMemory.c index 03e337bd09c..14be69fc9e1 100644 --- a/runtime/jvmti/jvmtiMemory.c +++ b/runtime/jvmti/jvmtiMemory.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiMethod.c b/runtime/jvmti/jvmtiMethod.c index c41da3f98d9..b1aa2a3975b 100644 --- a/runtime/jvmti/jvmtiMethod.c +++ b/runtime/jvmti/jvmtiMethod.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiModules.c b/runtime/jvmti/jvmtiModules.c index 88b2945156c..b6abeaaa3f4 100644 --- a/runtime/jvmti/jvmtiModules.c +++ b/runtime/jvmti/jvmtiModules.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" #include "jvmti_internal.h" diff --git a/runtime/jvmti/jvmtiObject.c b/runtime/jvmti/jvmtiObject.c index da9489c80a3..073f066eb73 100644 --- a/runtime/jvmti/jvmtiObject.c +++ b/runtime/jvmti/jvmtiObject.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiRawMonitor.c b/runtime/jvmti/jvmtiRawMonitor.c index abcac2b4375..695b7b75c26 100644 --- a/runtime/jvmti/jvmtiRawMonitor.c +++ b/runtime/jvmti/jvmtiRawMonitor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiStackFrame.c b/runtime/jvmti/jvmtiStackFrame.c index bc454ccc95d..50bd74a5f2a 100644 --- a/runtime/jvmti/jvmtiStackFrame.c +++ b/runtime/jvmti/jvmtiStackFrame.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiStartup.c b/runtime/jvmti/jvmtiStartup.c index 6519a576a48..98f69d62f10 100644 --- a/runtime/jvmti/jvmtiStartup.c +++ b/runtime/jvmti/jvmtiStartup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jvmti/jvmtiSystemProperties.c b/runtime/jvmti/jvmtiSystemProperties.c index 3a9a48f6897..e075580ccd2 100644 --- a/runtime/jvmti/jvmtiSystemProperties.c +++ b/runtime/jvmti/jvmtiSystemProperties.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "vmi.h" diff --git a/runtime/jvmti/jvmtiThread.c b/runtime/jvmti/jvmtiThread.c index 9f43f611d51..249188a6e31 100644 --- a/runtime/jvmti/jvmtiThread.c +++ b/runtime/jvmti/jvmtiThread.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/jvmti/jvmtiThreadGroup.c b/runtime/jvmti/jvmtiThreadGroup.c index bdb2ce4d546..48c47a3aa4f 100644 --- a/runtime/jvmti/jvmtiThreadGroup.c +++ b/runtime/jvmti/jvmtiThreadGroup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiTimers.c b/runtime/jvmti/jvmtiTimers.c index d66566a3e42..a06f8094b0e 100644 --- a/runtime/jvmti/jvmtiTimers.c +++ b/runtime/jvmti/jvmtiTimers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmtiWatchedField.c b/runtime/jvmti/jvmtiWatchedField.c index 8941bfbf9ca..c3c6aaaae6b 100644 --- a/runtime/jvmti/jvmtiWatchedField.c +++ b/runtime/jvmti/jvmtiWatchedField.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/jvmti/jvmti_internal.h b/runtime/jvmti/jvmti_internal.h index 6e2d69d0268..04556e893c2 100644 --- a/runtime/jvmti/jvmti_internal.h +++ b/runtime/jvmti/jvmti_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jvmti_internal_h diff --git a/runtime/jvmti/module.xml b/runtime/jvmti/module.xml index cdcf14b9ae1..9f5a28a13ab 100644 --- a/runtime/jvmti/module.xml +++ b/runtime/jvmti/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/jvmti/suspendhelper.cpp b/runtime/jvmti/suspendhelper.cpp index a726acad8e6..6ab50f80529 100644 --- a/runtime/jvmti/suspendhelper.cpp +++ b/runtime/jvmti/suspendhelper.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmtiHelpers.h" diff --git a/runtime/lib/.readme b/runtime/lib/.readme index c2a166f6592..864040fefe0 100644 --- a/runtime/lib/.readme +++ b/runtime/lib/.readme @@ -16,6 +16,6 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 File to force creation of the 'lib' directory which buildtools, etc count on. \ No newline at end of file diff --git a/runtime/libffi/CMakeLists.txt b/runtime/libffi/CMakeLists.txt index 89fece87737..bb8d8f8883c 100644 --- a/runtime/libffi/CMakeLists.txt +++ b/runtime/libffi/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/libffi/about.html b/runtime/libffi/about.html index d661936d08f..ee7d25e8969 100644 --- a/runtime/libffi/about.html +++ b/runtime/libffi/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/runtime/libffi/module.xml b/runtime/libffi/module.xml index 06649f12541..d3e1e5882a3 100644 --- a/runtime/libffi/module.xml +++ b/runtime/libffi/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/makelib/cmain.c b/runtime/makelib/cmain.c index fc2cd5a8753..76b801f42e7 100644 --- a/runtime/makelib/cmain.c +++ b/runtime/makelib/cmain.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) diff --git a/runtime/makelib/copyright.c.ftl b/runtime/makelib/copyright.c.ftl index 239e588b0ff..28690946d55 100644 --- a/runtime/makelib/copyright.c.ftl +++ b/runtime/makelib/copyright.c.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Autogenerated code. A copyright string must be included in each DLL and executable */ @@ -36,4 +36,4 @@ const char j9copyright[] = "Copyright (c) 1991, ${uma.year} IBM Corp. and othe "OpenJDK Assembly Exception [2].\n\n" "[1] https://www.gnu.org/software/classpath/license.html\n" "[2] https://openjdk.org/legal/assembly-exception.html\n\n" - "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception\n"; + "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0\n"; diff --git a/runtime/makelib/copyright.c.in b/runtime/makelib/copyright.c.in index 5992f106810..10202e31657 100644 --- a/runtime/makelib/copyright.c.in +++ b/runtime/makelib/copyright.c.in @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Autogenerated code. A copyright string must be included in each DLL and executable */ @@ -36,4 +36,4 @@ const char j9copyright[] = "Copyright (c) 1991, ${J9VM_CURRENT_YEAR} IBM Corp. "OpenJDK Assembly Exception [2].\n\n" "[1] https://www.gnu.org/software/classpath/license.html\n" "[2] https://openjdk.org/legal/assembly-exception.html\n\n" - "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception\n"; + "SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0\n"; diff --git a/runtime/makelib/empty_cpp.cpp b/runtime/makelib/empty_cpp.cpp index 35fc144536e..556ead63063 100644 --- a/runtime/makelib/empty_cpp.cpp +++ b/runtime/makelib/empty_cpp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Helper file for precompiled header support, the Microsoft compiler needs something to compile. */ diff --git a/runtime/makelib/ffi_copyright.c.ftl b/runtime/makelib/ffi_copyright.c.ftl index 6c1c8b84877..06195784bab 100644 --- a/runtime/makelib/ffi_copyright.c.ftl +++ b/runtime/makelib/ffi_copyright.c.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Autogenerated code. A copyright string must be included in each DLL and executable */ diff --git a/runtime/makelib/j9dll.c b/runtime/makelib/j9dll.c index 6b3558a6d07..2ff50910480 100644 --- a/runtime/makelib/j9dll.c +++ b/runtime/makelib/j9dll.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/makelib/masm2gas.pl b/runtime/makelib/masm2gas.pl index e8767e663ae..c07fb8be2bf 100644 --- a/runtime/makelib/masm2gas.pl +++ b/runtime/makelib/masm2gas.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # masm2gas.pl: translates Microsoft Assembler files to GNU Assembler format diff --git a/runtime/makelib/mkconstants.mk.ftl b/runtime/makelib/mkconstants.mk.ftl index 5634895a793..f7dada028b3 100644 --- a/runtime/makelib/mkconstants.mk.ftl +++ b/runtime/makelib/mkconstants.mk.ftl @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # List all flags that are enabled. <#list uma.spec.flags as flag> diff --git a/runtime/makelib/targets.mk.aix.inc.ftl b/runtime/makelib/targets.mk.aix.inc.ftl index f5cc2f3775b..40adeae5e53 100644 --- a/runtime/makelib/targets.mk.aix.inc.ftl +++ b/runtime/makelib/targets.mk.aix.inc.ftl @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> <#assign lib_target_rule> diff --git a/runtime/makelib/targets.mk.ftl b/runtime/makelib/targets.mk.ftl index 91c31d8ec34..1abf887eaf0 100644 --- a/runtime/makelib/targets.mk.ftl +++ b/runtime/makelib/targets.mk.ftl @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # The following section converts Shared Libraries to Static Libraries # when doing a static build. diff --git a/runtime/makelib/targets.mk.linux.inc.ftl b/runtime/makelib/targets.mk.linux.inc.ftl index 6cef071cffa..69eae1ce27a 100644 --- a/runtime/makelib/targets.mk.linux.inc.ftl +++ b/runtime/makelib/targets.mk.linux.inc.ftl @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> <#if uma.spec.processor.arm> diff --git a/runtime/makelib/targets.mk.osx.inc.ftl b/runtime/makelib/targets.mk.osx.inc.ftl index fd27c6a15c6..4b4692f206a 100644 --- a/runtime/makelib/targets.mk.osx.inc.ftl +++ b/runtime/makelib/targets.mk.osx.inc.ftl @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> <#assign lib_target_rule> diff --git a/runtime/makelib/targets.mk.vendor.inc.ftl b/runtime/makelib/targets.mk.vendor.inc.ftl index 0c021849203..acc0d46b135 100644 --- a/runtime/makelib/targets.mk.vendor.inc.ftl +++ b/runtime/makelib/targets.mk.vendor.inc.ftl @@ -17,6 +17,6 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/makelib/targets.mk.win.inc.ftl b/runtime/makelib/targets.mk.win.inc.ftl index 6058394385b..abd3947caf8 100644 --- a/runtime/makelib/targets.mk.win.inc.ftl +++ b/runtime/makelib/targets.mk.win.inc.ftl @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> <#assign lib_target_rule> diff --git a/runtime/makelib/targets.mk.zos.inc.ftl b/runtime/makelib/targets.mk.zos.inc.ftl index 78e2a94ef95..af3b259dc89 100644 --- a/runtime/makelib/targets.mk.zos.inc.ftl +++ b/runtime/makelib/targets.mk.zos.inc.ftl @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # z/os linker does not support link groups. We use this feature on other platforms to help diff --git a/runtime/makelib/targets.mk.ztpf.inc.ftl b/runtime/makelib/targets.mk.ztpf.inc.ftl index 9ae3b65f6c1..5265dedaf37 100644 --- a/runtime/makelib/targets.mk.ztpf.inc.ftl +++ b/runtime/makelib/targets.mk.ztpf.inc.ftl @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> <#if uma.spec.properties.uma_crossCompilerPath.defined> diff --git a/runtime/makelib/uma.properties b/runtime/makelib/uma.properties index 4faf7683714..15ddc2038ae 100644 --- a/runtime/makelib/uma.properties +++ b/runtime/makelib/uma.properties @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # J9 UMA properties file # This file contains options that control J9 UMA behaviour diff --git a/runtime/makelib/zlib_copyright.c.ftl b/runtime/makelib/zlib_copyright.c.ftl index 1540541844d..5ed1b7ac422 100644 --- a/runtime/makelib/zlib_copyright.c.ftl +++ b/runtime/makelib/zlib_copyright.c.ftl @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Autogenerated code. A copyright string must be included in each DLL and executable */ diff --git a/runtime/mgmt/CMakeLists.txt b/runtime/mgmt/CMakeLists.txt index bcf3e517648..e89d5f91a71 100644 --- a/runtime/mgmt/CMakeLists.txt +++ b/runtime/mgmt/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(management_ext SHARED diff --git a/runtime/mgmt/mgmtinit.c b/runtime/mgmt/mgmtinit.c index 84ad500114f..0e1ce3fb8b8 100644 --- a/runtime/mgmt/mgmtinit.c +++ b/runtime/mgmt/mgmtinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) diff --git a/runtime/mgmt/module.xml b/runtime/mgmt/module.xml index 1abb52038a0..518e033e1e2 100644 --- a/runtime/mgmt/module.xml +++ b/runtime/mgmt/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/module.xml b/runtime/module.xml index 6771f993900..4c5ea3fe514 100644 --- a/runtime/module.xml +++ b/runtime/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/nls/cdrt/codert.nls b/runtime/nls/cdrt/codert.nls index d7ebd34e8c2..ad06561b1d7 100644 --- a/runtime/nls/cdrt/codert.nls +++ b/runtime/nls/cdrt/codert.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_ca.nls b/runtime/nls/cdrt/codert_ca.nls index c19f1061364..e2c5a6810a5 100644 --- a/runtime/nls/cdrt/codert_ca.nls +++ b/runtime/nls/cdrt/codert_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_cs.nls b/runtime/nls/cdrt/codert_cs.nls index 407478f07bd..c50967355ca 100644 --- a/runtime/nls/cdrt/codert_cs.nls +++ b/runtime/nls/cdrt/codert_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_de.nls b/runtime/nls/cdrt/codert_de.nls index 5452aa33a8a..b43ce3f8bc8 100644 --- a/runtime/nls/cdrt/codert_de.nls +++ b/runtime/nls/cdrt/codert_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_es.nls b/runtime/nls/cdrt/codert_es.nls index 81621786a5b..787465af2c8 100644 --- a/runtime/nls/cdrt/codert_es.nls +++ b/runtime/nls/cdrt/codert_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_fr.nls b/runtime/nls/cdrt/codert_fr.nls index b9056552ea8..6a036ec8d47 100644 --- a/runtime/nls/cdrt/codert_fr.nls +++ b/runtime/nls/cdrt/codert_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_hu.nls b/runtime/nls/cdrt/codert_hu.nls index cd841aabd75..d54e64d6d39 100644 --- a/runtime/nls/cdrt/codert_hu.nls +++ b/runtime/nls/cdrt/codert_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_it.nls b/runtime/nls/cdrt/codert_it.nls index 42a20bd2dae..26c0d058051 100644 --- a/runtime/nls/cdrt/codert_it.nls +++ b/runtime/nls/cdrt/codert_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_ja.nls b/runtime/nls/cdrt/codert_ja.nls index 472702dab1d..e170170ce0a 100644 --- a/runtime/nls/cdrt/codert_ja.nls +++ b/runtime/nls/cdrt/codert_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_ko.nls b/runtime/nls/cdrt/codert_ko.nls index ae59b5e4284..85b528d729a 100644 --- a/runtime/nls/cdrt/codert_ko.nls +++ b/runtime/nls/cdrt/codert_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_pl.nls b/runtime/nls/cdrt/codert_pl.nls index f370b65b8d6..437e498af56 100644 --- a/runtime/nls/cdrt/codert_pl.nls +++ b/runtime/nls/cdrt/codert_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_pt_BR.nls b/runtime/nls/cdrt/codert_pt_BR.nls index b37af5f7fa0..6142adad634 100644 --- a/runtime/nls/cdrt/codert_pt_BR.nls +++ b/runtime/nls/cdrt/codert_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_ru.nls b/runtime/nls/cdrt/codert_ru.nls index 85a658bc73e..8ecbd76ef5f 100644 --- a/runtime/nls/cdrt/codert_ru.nls +++ b/runtime/nls/cdrt/codert_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_sk.nls b/runtime/nls/cdrt/codert_sk.nls index a202e9138ba..e03f6df06c6 100644 --- a/runtime/nls/cdrt/codert_sk.nls +++ b/runtime/nls/cdrt/codert_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_sl.nls b/runtime/nls/cdrt/codert_sl.nls index d3ac13b3bc3..c079b7df4c3 100644 --- a/runtime/nls/cdrt/codert_sl.nls +++ b/runtime/nls/cdrt/codert_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_tr.nls b/runtime/nls/cdrt/codert_tr.nls index 2d4df8a2465..68268092e0e 100644 --- a/runtime/nls/cdrt/codert_tr.nls +++ b/runtime/nls/cdrt/codert_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_zh.nls b/runtime/nls/cdrt/codert_zh.nls index 7bed47a7ccb..eb4aa59b30d 100644 --- a/runtime/nls/cdrt/codert_zh.nls +++ b/runtime/nls/cdrt/codert_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_zh_CN.nls b/runtime/nls/cdrt/codert_zh_CN.nls index 7bed47a7ccb..eb4aa59b30d 100644 --- a/runtime/nls/cdrt/codert_zh_CN.nls +++ b/runtime/nls/cdrt/codert_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cdrt/codert_zh_TW.nls b/runtime/nls/cdrt/codert_zh_TW.nls index c7d9c34bc0d..792cc221811 100644 --- a/runtime/nls/cdrt/codert_zh_TW.nls +++ b/runtime/nls/cdrt/codert_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the codert module. diff --git a/runtime/nls/cfre/cfrerr.nls b/runtime/nls/cfre/cfrerr.nls index b43f1860c13..aecb4155a71 100644 --- a/runtime/nls/cfre/cfrerr.nls +++ b/runtime/nls/cfre/cfrerr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_ca.nls b/runtime/nls/cfre/cfrerr_ca.nls index 60df69fb493..120aa532a79 100644 --- a/runtime/nls/cfre/cfrerr_ca.nls +++ b/runtime/nls/cfre/cfrerr_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_cs.nls b/runtime/nls/cfre/cfrerr_cs.nls index bc08be24e85..89d8c0625af 100644 --- a/runtime/nls/cfre/cfrerr_cs.nls +++ b/runtime/nls/cfre/cfrerr_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_de.nls b/runtime/nls/cfre/cfrerr_de.nls index 1ef5cf4a057..e89927f3815 100644 --- a/runtime/nls/cfre/cfrerr_de.nls +++ b/runtime/nls/cfre/cfrerr_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_es.nls b/runtime/nls/cfre/cfrerr_es.nls index 6ceb24ab42f..6054a86845a 100644 --- a/runtime/nls/cfre/cfrerr_es.nls +++ b/runtime/nls/cfre/cfrerr_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_fr.nls b/runtime/nls/cfre/cfrerr_fr.nls index 3d5c69d55ac..4c0cf7fdf9e 100644 --- a/runtime/nls/cfre/cfrerr_fr.nls +++ b/runtime/nls/cfre/cfrerr_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_hu.nls b/runtime/nls/cfre/cfrerr_hu.nls index e1a962156f7..8e4e161b333 100644 --- a/runtime/nls/cfre/cfrerr_hu.nls +++ b/runtime/nls/cfre/cfrerr_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_it.nls b/runtime/nls/cfre/cfrerr_it.nls index 7d41da07132..a91f7f5ccd2 100644 --- a/runtime/nls/cfre/cfrerr_it.nls +++ b/runtime/nls/cfre/cfrerr_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_ja.nls b/runtime/nls/cfre/cfrerr_ja.nls index 1fdd54e4df2..6033e25f769 100644 --- a/runtime/nls/cfre/cfrerr_ja.nls +++ b/runtime/nls/cfre/cfrerr_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_ko.nls b/runtime/nls/cfre/cfrerr_ko.nls index 413d2bc0989..4067997e75d 100644 --- a/runtime/nls/cfre/cfrerr_ko.nls +++ b/runtime/nls/cfre/cfrerr_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_pl.nls b/runtime/nls/cfre/cfrerr_pl.nls index 66d50b96276..9e4f1119656 100644 --- a/runtime/nls/cfre/cfrerr_pl.nls +++ b/runtime/nls/cfre/cfrerr_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_pt_BR.nls b/runtime/nls/cfre/cfrerr_pt_BR.nls index 6371608abe5..da2dfe93ba0 100644 --- a/runtime/nls/cfre/cfrerr_pt_BR.nls +++ b/runtime/nls/cfre/cfrerr_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_ru.nls b/runtime/nls/cfre/cfrerr_ru.nls index 2b771926450..ce62cd64df6 100644 --- a/runtime/nls/cfre/cfrerr_ru.nls +++ b/runtime/nls/cfre/cfrerr_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_sk.nls b/runtime/nls/cfre/cfrerr_sk.nls index 4c1a7ae79e4..74c6430461d 100644 --- a/runtime/nls/cfre/cfrerr_sk.nls +++ b/runtime/nls/cfre/cfrerr_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_sl.nls b/runtime/nls/cfre/cfrerr_sl.nls index 64b274f9685..f53cc1414a8 100644 --- a/runtime/nls/cfre/cfrerr_sl.nls +++ b/runtime/nls/cfre/cfrerr_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_tr.nls b/runtime/nls/cfre/cfrerr_tr.nls index 861e84fc4ab..33459876018 100644 --- a/runtime/nls/cfre/cfrerr_tr.nls +++ b/runtime/nls/cfre/cfrerr_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_zh.nls b/runtime/nls/cfre/cfrerr_zh.nls index 26994fda943..65ad1adde15 100644 --- a/runtime/nls/cfre/cfrerr_zh.nls +++ b/runtime/nls/cfre/cfrerr_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_zh_CN.nls b/runtime/nls/cfre/cfrerr_zh_CN.nls index 26994fda943..65ad1adde15 100644 --- a/runtime/nls/cfre/cfrerr_zh_CN.nls +++ b/runtime/nls/cfre/cfrerr_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/cfre/cfrerr_zh_TW.nls b/runtime/nls/cfre/cfrerr_zh_TW.nls index 0a31a4cff23..7c2e5187d17 100644 --- a/runtime/nls/cfre/cfrerr_zh_TW.nls +++ b/runtime/nls/cfre/cfrerr_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Class File Reader errors. diff --git a/runtime/nls/dump/j9dmp.nls b/runtime/nls/dump/j9dmp.nls index dea4a91e253..395283ca393 100644 --- a/runtime/nls/dump/j9dmp.nls +++ b/runtime/nls/dump/j9dmp.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_ca.nls b/runtime/nls/dump/j9dmp_ca.nls index 65f918903f8..6fb424b596e 100644 --- a/runtime/nls/dump/j9dmp_ca.nls +++ b/runtime/nls/dump/j9dmp_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_cs.nls b/runtime/nls/dump/j9dmp_cs.nls index 010eaabcdb2..99668a69d08 100644 --- a/runtime/nls/dump/j9dmp_cs.nls +++ b/runtime/nls/dump/j9dmp_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_de.nls b/runtime/nls/dump/j9dmp_de.nls index 6d6153c8893..13864e2b351 100644 --- a/runtime/nls/dump/j9dmp_de.nls +++ b/runtime/nls/dump/j9dmp_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_es.nls b/runtime/nls/dump/j9dmp_es.nls index a564b5e88bb..0558833550f 100644 --- a/runtime/nls/dump/j9dmp_es.nls +++ b/runtime/nls/dump/j9dmp_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_fr.nls b/runtime/nls/dump/j9dmp_fr.nls index 7914e6bf200..fc1ef74c899 100644 --- a/runtime/nls/dump/j9dmp_fr.nls +++ b/runtime/nls/dump/j9dmp_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_hu.nls b/runtime/nls/dump/j9dmp_hu.nls index 11d62cda756..0be507c6273 100644 --- a/runtime/nls/dump/j9dmp_hu.nls +++ b/runtime/nls/dump/j9dmp_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_it.nls b/runtime/nls/dump/j9dmp_it.nls index 8afe5d827ab..97526e739ba 100644 --- a/runtime/nls/dump/j9dmp_it.nls +++ b/runtime/nls/dump/j9dmp_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_ja.nls b/runtime/nls/dump/j9dmp_ja.nls index 71f5a80181f..b782e4b693b 100644 --- a/runtime/nls/dump/j9dmp_ja.nls +++ b/runtime/nls/dump/j9dmp_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_ko.nls b/runtime/nls/dump/j9dmp_ko.nls index 2a74a9d3998..7a93b8551ea 100644 --- a/runtime/nls/dump/j9dmp_ko.nls +++ b/runtime/nls/dump/j9dmp_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_pl.nls b/runtime/nls/dump/j9dmp_pl.nls index 9ad96a72114..08aaa77e8d6 100644 --- a/runtime/nls/dump/j9dmp_pl.nls +++ b/runtime/nls/dump/j9dmp_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_pt_BR.nls b/runtime/nls/dump/j9dmp_pt_BR.nls index 66b02e4adba..b9be419ed0b 100644 --- a/runtime/nls/dump/j9dmp_pt_BR.nls +++ b/runtime/nls/dump/j9dmp_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_ru.nls b/runtime/nls/dump/j9dmp_ru.nls index 8cf0184446d..d3200cc3f24 100644 --- a/runtime/nls/dump/j9dmp_ru.nls +++ b/runtime/nls/dump/j9dmp_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_sk.nls b/runtime/nls/dump/j9dmp_sk.nls index ea497b20328..ae7325d8836 100644 --- a/runtime/nls/dump/j9dmp_sk.nls +++ b/runtime/nls/dump/j9dmp_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_sl.nls b/runtime/nls/dump/j9dmp_sl.nls index 2c3d4f23afb..ca108bbbcb2 100644 --- a/runtime/nls/dump/j9dmp_sl.nls +++ b/runtime/nls/dump/j9dmp_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_tr.nls b/runtime/nls/dump/j9dmp_tr.nls index f13e224ed75..e70be86cb38 100644 --- a/runtime/nls/dump/j9dmp_tr.nls +++ b/runtime/nls/dump/j9dmp_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_zh.nls b/runtime/nls/dump/j9dmp_zh.nls index 54a186b8a5d..45cbe58cc57 100644 --- a/runtime/nls/dump/j9dmp_zh.nls +++ b/runtime/nls/dump/j9dmp_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_zh_CN.nls b/runtime/nls/dump/j9dmp_zh_CN.nls index 54a186b8a5d..45cbe58cc57 100644 --- a/runtime/nls/dump/j9dmp_zh_CN.nls +++ b/runtime/nls/dump/j9dmp_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/dump/j9dmp_zh_TW.nls b/runtime/nls/dump/j9dmp_zh_TW.nls index b9f61d37232..e26b9797a3b 100644 --- a/runtime/nls/dump/j9dmp_zh_TW.nls +++ b/runtime/nls/dump/j9dmp_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RASdump module. diff --git a/runtime/nls/exel/exelib.nls b/runtime/nls/exel/exelib.nls index 57b24870210..1d3ce76ebbe 100644 --- a/runtime/nls/exel/exelib.nls +++ b/runtime/nls/exel/exelib.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_ca.nls b/runtime/nls/exel/exelib_ca.nls index 13ff286fbcc..b5255319287 100644 --- a/runtime/nls/exel/exelib_ca.nls +++ b/runtime/nls/exel/exelib_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_cs.nls b/runtime/nls/exel/exelib_cs.nls index 3404292db28..4c4de312ac3 100644 --- a/runtime/nls/exel/exelib_cs.nls +++ b/runtime/nls/exel/exelib_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_de.nls b/runtime/nls/exel/exelib_de.nls index 8fd4c043194..b8bf25d6159 100644 --- a/runtime/nls/exel/exelib_de.nls +++ b/runtime/nls/exel/exelib_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_es.nls b/runtime/nls/exel/exelib_es.nls index 1487698dffa..3e2fe911a4f 100644 --- a/runtime/nls/exel/exelib_es.nls +++ b/runtime/nls/exel/exelib_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_fr.nls b/runtime/nls/exel/exelib_fr.nls index 7b1980373e9..44a25324c28 100644 --- a/runtime/nls/exel/exelib_fr.nls +++ b/runtime/nls/exel/exelib_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_hu.nls b/runtime/nls/exel/exelib_hu.nls index 21723299510..19f1db271b1 100644 --- a/runtime/nls/exel/exelib_hu.nls +++ b/runtime/nls/exel/exelib_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_it.nls b/runtime/nls/exel/exelib_it.nls index 853d2d8d394..587dc269010 100644 --- a/runtime/nls/exel/exelib_it.nls +++ b/runtime/nls/exel/exelib_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_ja.nls b/runtime/nls/exel/exelib_ja.nls index c3509746d22..a0d90683224 100644 --- a/runtime/nls/exel/exelib_ja.nls +++ b/runtime/nls/exel/exelib_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_ko.nls b/runtime/nls/exel/exelib_ko.nls index 6a75018c225..2e221b77828 100644 --- a/runtime/nls/exel/exelib_ko.nls +++ b/runtime/nls/exel/exelib_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_pl.nls b/runtime/nls/exel/exelib_pl.nls index 1915bdcc9b2..a8d5497dedf 100644 --- a/runtime/nls/exel/exelib_pl.nls +++ b/runtime/nls/exel/exelib_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_pt_BR.nls b/runtime/nls/exel/exelib_pt_BR.nls index 3f7789e0498..9c0e1f83bcc 100644 --- a/runtime/nls/exel/exelib_pt_BR.nls +++ b/runtime/nls/exel/exelib_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_ru.nls b/runtime/nls/exel/exelib_ru.nls index a8f3add296f..d9b5672a716 100644 --- a/runtime/nls/exel/exelib_ru.nls +++ b/runtime/nls/exel/exelib_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_sk.nls b/runtime/nls/exel/exelib_sk.nls index c9af15ebc19..2a962c16dee 100644 --- a/runtime/nls/exel/exelib_sk.nls +++ b/runtime/nls/exel/exelib_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_sl.nls b/runtime/nls/exel/exelib_sl.nls index ba8ac1c83aa..3c27e1aaae3 100644 --- a/runtime/nls/exel/exelib_sl.nls +++ b/runtime/nls/exel/exelib_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_tr.nls b/runtime/nls/exel/exelib_tr.nls index 90e0020dcb2..56892b9adc4 100644 --- a/runtime/nls/exel/exelib_tr.nls +++ b/runtime/nls/exel/exelib_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_zh.nls b/runtime/nls/exel/exelib_zh.nls index 36f4751d8be..b4b909d0658 100644 --- a/runtime/nls/exel/exelib_zh.nls +++ b/runtime/nls/exel/exelib_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_zh_CN.nls b/runtime/nls/exel/exelib_zh_CN.nls index 36f4751d8be..b4b909d0658 100644 --- a/runtime/nls/exel/exelib_zh_CN.nls +++ b/runtime/nls/exel/exelib_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/exel/exelib_zh_TW.nls b/runtime/nls/exel/exelib_zh_TW.nls index 7d878f9f878..86715305b94 100644 --- a/runtime/nls/exel/exelib_zh_TW.nls +++ b/runtime/nls/exel/exelib_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/j2se/j2se.nls b/runtime/nls/j2se/j2se.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se.nls +++ b/runtime/nls/j2se/j2se.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_ca.nls b/runtime/nls/j2se/j2se_ca.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_ca.nls +++ b/runtime/nls/j2se/j2se_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_cs.nls b/runtime/nls/j2se/j2se_cs.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_cs.nls +++ b/runtime/nls/j2se/j2se_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_de.nls b/runtime/nls/j2se/j2se_de.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_de.nls +++ b/runtime/nls/j2se/j2se_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_es.nls b/runtime/nls/j2se/j2se_es.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_es.nls +++ b/runtime/nls/j2se/j2se_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_fr.nls b/runtime/nls/j2se/j2se_fr.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_fr.nls +++ b/runtime/nls/j2se/j2se_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_hu.nls b/runtime/nls/j2se/j2se_hu.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_hu.nls +++ b/runtime/nls/j2se/j2se_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_it.nls b/runtime/nls/j2se/j2se_it.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_it.nls +++ b/runtime/nls/j2se/j2se_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_ja.nls b/runtime/nls/j2se/j2se_ja.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_ja.nls +++ b/runtime/nls/j2se/j2se_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_ko.nls b/runtime/nls/j2se/j2se_ko.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_ko.nls +++ b/runtime/nls/j2se/j2se_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_pl.nls b/runtime/nls/j2se/j2se_pl.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_pl.nls +++ b/runtime/nls/j2se/j2se_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_pt_BR.nls b/runtime/nls/j2se/j2se_pt_BR.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_pt_BR.nls +++ b/runtime/nls/j2se/j2se_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_ru.nls b/runtime/nls/j2se/j2se_ru.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_ru.nls +++ b/runtime/nls/j2se/j2se_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_sk.nls b/runtime/nls/j2se/j2se_sk.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_sk.nls +++ b/runtime/nls/j2se/j2se_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_sl.nls b/runtime/nls/j2se/j2se_sl.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_sl.nls +++ b/runtime/nls/j2se/j2se_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_tr.nls b/runtime/nls/j2se/j2se_tr.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_tr.nls +++ b/runtime/nls/j2se/j2se_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_zh.nls b/runtime/nls/j2se/j2se_zh.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_zh.nls +++ b/runtime/nls/j2se/j2se_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_zh_CN.nls b/runtime/nls/j2se/j2se_zh_CN.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_zh_CN.nls +++ b/runtime/nls/j2se/j2se_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j2se/j2se_zh_TW.nls b/runtime/nls/j2se/j2se_zh_TW.nls index 13d2ddd2e45..d143a5c521d 100644 --- a/runtime/nls/j2se/j2se_zh_TW.nls +++ b/runtime/nls/j2se/j2se_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9cl/j9jcl.nls b/runtime/nls/j9cl/j9jcl.nls index 9a53b72d6f7..0a0c30cfdaf 100644 --- a/runtime/nls/j9cl/j9jcl.nls +++ b/runtime/nls/j9cl/j9jcl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_ca.nls b/runtime/nls/j9cl/j9jcl_ca.nls index ade5c54626a..9502d71b0d0 100644 --- a/runtime/nls/j9cl/j9jcl_ca.nls +++ b/runtime/nls/j9cl/j9jcl_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_cs.nls b/runtime/nls/j9cl/j9jcl_cs.nls index 731b2d1de4e..13111017219 100644 --- a/runtime/nls/j9cl/j9jcl_cs.nls +++ b/runtime/nls/j9cl/j9jcl_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_de.nls b/runtime/nls/j9cl/j9jcl_de.nls index 550d5218daf..5f03a26c370 100644 --- a/runtime/nls/j9cl/j9jcl_de.nls +++ b/runtime/nls/j9cl/j9jcl_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_es.nls b/runtime/nls/j9cl/j9jcl_es.nls index 9efa061efc7..8573d4ea709 100644 --- a/runtime/nls/j9cl/j9jcl_es.nls +++ b/runtime/nls/j9cl/j9jcl_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_fr.nls b/runtime/nls/j9cl/j9jcl_fr.nls index 16db7889712..e5c70510aec 100644 --- a/runtime/nls/j9cl/j9jcl_fr.nls +++ b/runtime/nls/j9cl/j9jcl_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_hu.nls b/runtime/nls/j9cl/j9jcl_hu.nls index 2f2b6bebb1e..864123d0506 100644 --- a/runtime/nls/j9cl/j9jcl_hu.nls +++ b/runtime/nls/j9cl/j9jcl_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_it.nls b/runtime/nls/j9cl/j9jcl_it.nls index dd52137cc74..5f9102d75b9 100644 --- a/runtime/nls/j9cl/j9jcl_it.nls +++ b/runtime/nls/j9cl/j9jcl_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_ja.nls b/runtime/nls/j9cl/j9jcl_ja.nls index e175f91f409..0d1c49a2784 100644 --- a/runtime/nls/j9cl/j9jcl_ja.nls +++ b/runtime/nls/j9cl/j9jcl_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_ko.nls b/runtime/nls/j9cl/j9jcl_ko.nls index 6d67bb127fa..79ad082c2ec 100644 --- a/runtime/nls/j9cl/j9jcl_ko.nls +++ b/runtime/nls/j9cl/j9jcl_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_pl.nls b/runtime/nls/j9cl/j9jcl_pl.nls index 47fa1119df8..632d1014568 100644 --- a/runtime/nls/j9cl/j9jcl_pl.nls +++ b/runtime/nls/j9cl/j9jcl_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_pt_BR.nls b/runtime/nls/j9cl/j9jcl_pt_BR.nls index 5affbd1ae76..8980829b98e 100644 --- a/runtime/nls/j9cl/j9jcl_pt_BR.nls +++ b/runtime/nls/j9cl/j9jcl_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_ru.nls b/runtime/nls/j9cl/j9jcl_ru.nls index ff24853d82a..a30210a55a7 100644 --- a/runtime/nls/j9cl/j9jcl_ru.nls +++ b/runtime/nls/j9cl/j9jcl_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # diff --git a/runtime/nls/j9cl/j9jcl_sk.nls b/runtime/nls/j9cl/j9jcl_sk.nls index 99106a1f0a2..cf5fbbb215a 100644 --- a/runtime/nls/j9cl/j9jcl_sk.nls +++ b/runtime/nls/j9cl/j9jcl_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_sl.nls b/runtime/nls/j9cl/j9jcl_sl.nls index 0d3bb5b4575..19677c4e219 100644 --- a/runtime/nls/j9cl/j9jcl_sl.nls +++ b/runtime/nls/j9cl/j9jcl_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_tr.nls b/runtime/nls/j9cl/j9jcl_tr.nls index 00e75dbf917..735b7eb13ac 100644 --- a/runtime/nls/j9cl/j9jcl_tr.nls +++ b/runtime/nls/j9cl/j9jcl_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_zh.nls b/runtime/nls/j9cl/j9jcl_zh.nls index aefc641494b..82c9913e1f4 100644 --- a/runtime/nls/j9cl/j9jcl_zh.nls +++ b/runtime/nls/j9cl/j9jcl_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_zh_CN.nls b/runtime/nls/j9cl/j9jcl_zh_CN.nls index aefc641494b..82c9913e1f4 100644 --- a/runtime/nls/j9cl/j9jcl_zh_CN.nls +++ b/runtime/nls/j9cl/j9jcl_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9cl/j9jcl_zh_TW.nls b/runtime/nls/j9cl/j9jcl_zh_TW.nls index 3593936211b..74b1afe3a33 100644 --- a/runtime/nls/j9cl/j9jcl_zh_TW.nls +++ b/runtime/nls/j9cl/j9jcl_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/j9gc/j9modron.nls b/runtime/nls/j9gc/j9modron.nls index 6f0223da121..86ae32bad1e 100644 --- a/runtime/nls/j9gc/j9modron.nls +++ b/runtime/nls/j9gc/j9modron.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_ca.nls b/runtime/nls/j9gc/j9modron_ca.nls index 37f32072df9..2e3b57cf6ed 100644 --- a/runtime/nls/j9gc/j9modron_ca.nls +++ b/runtime/nls/j9gc/j9modron_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_cs.nls b/runtime/nls/j9gc/j9modron_cs.nls index 11bc2453cf7..eff491e9f0a 100644 --- a/runtime/nls/j9gc/j9modron_cs.nls +++ b/runtime/nls/j9gc/j9modron_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_de.nls b/runtime/nls/j9gc/j9modron_de.nls index 37452333c99..84355453284 100644 --- a/runtime/nls/j9gc/j9modron_de.nls +++ b/runtime/nls/j9gc/j9modron_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_es.nls b/runtime/nls/j9gc/j9modron_es.nls index 5454ed22b07..84a963d8654 100644 --- a/runtime/nls/j9gc/j9modron_es.nls +++ b/runtime/nls/j9gc/j9modron_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_fr.nls b/runtime/nls/j9gc/j9modron_fr.nls index 277af6b82fa..4092a87909d 100644 --- a/runtime/nls/j9gc/j9modron_fr.nls +++ b/runtime/nls/j9gc/j9modron_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_hu.nls b/runtime/nls/j9gc/j9modron_hu.nls index b799ec1eb9c..849a418831c 100644 --- a/runtime/nls/j9gc/j9modron_hu.nls +++ b/runtime/nls/j9gc/j9modron_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_it.nls b/runtime/nls/j9gc/j9modron_it.nls index 65a66e9ae6a..dd4cfd538d0 100644 --- a/runtime/nls/j9gc/j9modron_it.nls +++ b/runtime/nls/j9gc/j9modron_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_ja.nls b/runtime/nls/j9gc/j9modron_ja.nls index ff88b8cc567..f222152caa3 100644 --- a/runtime/nls/j9gc/j9modron_ja.nls +++ b/runtime/nls/j9gc/j9modron_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_ko.nls b/runtime/nls/j9gc/j9modron_ko.nls index 70cda0bb514..cdb6d9b6ada 100644 --- a/runtime/nls/j9gc/j9modron_ko.nls +++ b/runtime/nls/j9gc/j9modron_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_pl.nls b/runtime/nls/j9gc/j9modron_pl.nls index 419f9d57a66..1caef5bedb2 100644 --- a/runtime/nls/j9gc/j9modron_pl.nls +++ b/runtime/nls/j9gc/j9modron_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_pt_BR.nls b/runtime/nls/j9gc/j9modron_pt_BR.nls index 7c27d19043d..c1542186c5d 100644 --- a/runtime/nls/j9gc/j9modron_pt_BR.nls +++ b/runtime/nls/j9gc/j9modron_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_ru.nls b/runtime/nls/j9gc/j9modron_ru.nls index 4b88915cc7d..784aa6f273e 100644 --- a/runtime/nls/j9gc/j9modron_ru.nls +++ b/runtime/nls/j9gc/j9modron_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_sk.nls b/runtime/nls/j9gc/j9modron_sk.nls index 927f3333ad5..c06acb4acde 100644 --- a/runtime/nls/j9gc/j9modron_sk.nls +++ b/runtime/nls/j9gc/j9modron_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_sl.nls b/runtime/nls/j9gc/j9modron_sl.nls index e6a1a1f6fc8..ef2ee9f54d4 100644 --- a/runtime/nls/j9gc/j9modron_sl.nls +++ b/runtime/nls/j9gc/j9modron_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_tr.nls b/runtime/nls/j9gc/j9modron_tr.nls index 6eddb55c6f6..171d8e69b5f 100644 --- a/runtime/nls/j9gc/j9modron_tr.nls +++ b/runtime/nls/j9gc/j9modron_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_zh.nls b/runtime/nls/j9gc/j9modron_zh.nls index 147f752ec95..10570f178b5 100644 --- a/runtime/nls/j9gc/j9modron_zh.nls +++ b/runtime/nls/j9gc/j9modron_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_zh_CN.nls b/runtime/nls/j9gc/j9modron_zh_CN.nls index 147f752ec95..10570f178b5 100644 --- a/runtime/nls/j9gc/j9modron_zh_CN.nls +++ b/runtime/nls/j9gc/j9modron_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9gc/j9modron_zh_TW.nls b/runtime/nls/j9gc/j9modron_zh_TW.nls index 98c390307b3..b3c87f26c45 100644 --- a/runtime/nls/j9gc/j9modron_zh_TW.nls +++ b/runtime/nls/j9gc/j9modron_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9modron.nls diff --git a/runtime/nls/j9ri/j9ri.nls b/runtime/nls/j9ri/j9ri.nls index f5f46f3b9d9..af46cc15f1b 100644 --- a/runtime/nls/j9ri/j9ri.nls +++ b/runtime/nls/j9ri/j9ri.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_ca.nls b/runtime/nls/j9ri/j9ri_ca.nls index 983311b895d..4c327011277 100644 --- a/runtime/nls/j9ri/j9ri_ca.nls +++ b/runtime/nls/j9ri/j9ri_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_cs.nls b/runtime/nls/j9ri/j9ri_cs.nls index 945b4331e41..32d238b110e 100644 --- a/runtime/nls/j9ri/j9ri_cs.nls +++ b/runtime/nls/j9ri/j9ri_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_de.nls b/runtime/nls/j9ri/j9ri_de.nls index 25b90e28143..7bedf62f691 100644 --- a/runtime/nls/j9ri/j9ri_de.nls +++ b/runtime/nls/j9ri/j9ri_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_es.nls b/runtime/nls/j9ri/j9ri_es.nls index a657cfd0870..59565cfcdec 100644 --- a/runtime/nls/j9ri/j9ri_es.nls +++ b/runtime/nls/j9ri/j9ri_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_fr.nls b/runtime/nls/j9ri/j9ri_fr.nls index d2392dc3cf2..2cd7d329fe9 100644 --- a/runtime/nls/j9ri/j9ri_fr.nls +++ b/runtime/nls/j9ri/j9ri_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_hu.nls b/runtime/nls/j9ri/j9ri_hu.nls index 739ede42205..0f9ef1f429a 100644 --- a/runtime/nls/j9ri/j9ri_hu.nls +++ b/runtime/nls/j9ri/j9ri_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_it.nls b/runtime/nls/j9ri/j9ri_it.nls index 4a9f8deedf6..29da9b1ca3d 100644 --- a/runtime/nls/j9ri/j9ri_it.nls +++ b/runtime/nls/j9ri/j9ri_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_ja.nls b/runtime/nls/j9ri/j9ri_ja.nls index a60969e807c..1953132377b 100644 --- a/runtime/nls/j9ri/j9ri_ja.nls +++ b/runtime/nls/j9ri/j9ri_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_ko.nls b/runtime/nls/j9ri/j9ri_ko.nls index 85761c8a08a..0ad72d682e8 100644 --- a/runtime/nls/j9ri/j9ri_ko.nls +++ b/runtime/nls/j9ri/j9ri_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_pl.nls b/runtime/nls/j9ri/j9ri_pl.nls index 212b74c5899..0bafa1faada 100644 --- a/runtime/nls/j9ri/j9ri_pl.nls +++ b/runtime/nls/j9ri/j9ri_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_pt_BR.nls b/runtime/nls/j9ri/j9ri_pt_BR.nls index 26ef7114518..9ec8a6869cd 100644 --- a/runtime/nls/j9ri/j9ri_pt_BR.nls +++ b/runtime/nls/j9ri/j9ri_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_ru.nls b/runtime/nls/j9ri/j9ri_ru.nls index cfe14a0661b..c821b95afa1 100644 --- a/runtime/nls/j9ri/j9ri_ru.nls +++ b/runtime/nls/j9ri/j9ri_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_sk.nls b/runtime/nls/j9ri/j9ri_sk.nls index 7680128bce9..0997e4678ed 100644 --- a/runtime/nls/j9ri/j9ri_sk.nls +++ b/runtime/nls/j9ri/j9ri_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_sl.nls b/runtime/nls/j9ri/j9ri_sl.nls index 3aff11f18de..e4ba7052e87 100644 --- a/runtime/nls/j9ri/j9ri_sl.nls +++ b/runtime/nls/j9ri/j9ri_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_tr.nls b/runtime/nls/j9ri/j9ri_tr.nls index 7617f0a84a4..df5adc7703b 100644 --- a/runtime/nls/j9ri/j9ri_tr.nls +++ b/runtime/nls/j9ri/j9ri_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_zh.nls b/runtime/nls/j9ri/j9ri_zh.nls index 542280db693..6a110a44a50 100644 --- a/runtime/nls/j9ri/j9ri_zh.nls +++ b/runtime/nls/j9ri/j9ri_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_zh_CN.nls b/runtime/nls/j9ri/j9ri_zh_CN.nls index 542280db693..6a110a44a50 100644 --- a/runtime/nls/j9ri/j9ri_zh_CN.nls +++ b/runtime/nls/j9ri/j9ri_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ri/j9ri_zh_TW.nls b/runtime/nls/j9ri/j9ri_zh_TW.nls index 291a76d36ac..5b9e8ab3683 100644 --- a/runtime/nls/j9ri/j9ri_zh_TW.nls +++ b/runtime/nls/j9ri/j9ri_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMRI module diff --git a/runtime/nls/j9ti/jvmti.nls b/runtime/nls/j9ti/jvmti.nls index 7f35cb69bb2..b08dee9ad89 100644 --- a/runtime/nls/j9ti/jvmti.nls +++ b/runtime/nls/j9ti/jvmti.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_ca.nls b/runtime/nls/j9ti/jvmti_ca.nls index cb4597e1e0c..5d7771f61d1 100644 --- a/runtime/nls/j9ti/jvmti_ca.nls +++ b/runtime/nls/j9ti/jvmti_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_cs.nls b/runtime/nls/j9ti/jvmti_cs.nls index a3b3ad3ea60..c73f185af71 100644 --- a/runtime/nls/j9ti/jvmti_cs.nls +++ b/runtime/nls/j9ti/jvmti_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_de.nls b/runtime/nls/j9ti/jvmti_de.nls index 61d9497b31c..c66adf20a5a 100644 --- a/runtime/nls/j9ti/jvmti_de.nls +++ b/runtime/nls/j9ti/jvmti_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_es.nls b/runtime/nls/j9ti/jvmti_es.nls index 29cada1078e..eb1e5c6e3c2 100644 --- a/runtime/nls/j9ti/jvmti_es.nls +++ b/runtime/nls/j9ti/jvmti_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_fr.nls b/runtime/nls/j9ti/jvmti_fr.nls index 1460d769c36..a910d26e171 100644 --- a/runtime/nls/j9ti/jvmti_fr.nls +++ b/runtime/nls/j9ti/jvmti_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_hu.nls b/runtime/nls/j9ti/jvmti_hu.nls index a57624a78b5..ee888e01719 100644 --- a/runtime/nls/j9ti/jvmti_hu.nls +++ b/runtime/nls/j9ti/jvmti_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_it.nls b/runtime/nls/j9ti/jvmti_it.nls index 94eeaa184f1..3ce7c91d2b0 100644 --- a/runtime/nls/j9ti/jvmti_it.nls +++ b/runtime/nls/j9ti/jvmti_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_ja.nls b/runtime/nls/j9ti/jvmti_ja.nls index 575c9c5d829..95e0fdd3c3b 100644 --- a/runtime/nls/j9ti/jvmti_ja.nls +++ b/runtime/nls/j9ti/jvmti_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_ko.nls b/runtime/nls/j9ti/jvmti_ko.nls index e905e2c89ea..14939877d5c 100644 --- a/runtime/nls/j9ti/jvmti_ko.nls +++ b/runtime/nls/j9ti/jvmti_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_pl.nls b/runtime/nls/j9ti/jvmti_pl.nls index 6b6e6b429a9..bf9cc4cbd10 100644 --- a/runtime/nls/j9ti/jvmti_pl.nls +++ b/runtime/nls/j9ti/jvmti_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_pt_BR.nls b/runtime/nls/j9ti/jvmti_pt_BR.nls index a05c620f394..2c209ae41cf 100644 --- a/runtime/nls/j9ti/jvmti_pt_BR.nls +++ b/runtime/nls/j9ti/jvmti_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_ru.nls b/runtime/nls/j9ti/jvmti_ru.nls index 20ad4a2f009..b16babf3b12 100644 --- a/runtime/nls/j9ti/jvmti_ru.nls +++ b/runtime/nls/j9ti/jvmti_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_sk.nls b/runtime/nls/j9ti/jvmti_sk.nls index 59fd171c397..88662a941e6 100644 --- a/runtime/nls/j9ti/jvmti_sk.nls +++ b/runtime/nls/j9ti/jvmti_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_sl.nls b/runtime/nls/j9ti/jvmti_sl.nls index 158c11774ed..85569661185 100644 --- a/runtime/nls/j9ti/jvmti_sl.nls +++ b/runtime/nls/j9ti/jvmti_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_tr.nls b/runtime/nls/j9ti/jvmti_tr.nls index b383db8a45a..e907338fe10 100644 --- a/runtime/nls/j9ti/jvmti_tr.nls +++ b/runtime/nls/j9ti/jvmti_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_zh.nls b/runtime/nls/j9ti/jvmti_zh.nls index 3f8b50b9d14..692dc704df2 100644 --- a/runtime/nls/j9ti/jvmti_zh.nls +++ b/runtime/nls/j9ti/jvmti_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_zh_CN.nls b/runtime/nls/j9ti/jvmti_zh_CN.nls index 3f8b50b9d14..692dc704df2 100644 --- a/runtime/nls/j9ti/jvmti_zh_CN.nls +++ b/runtime/nls/j9ti/jvmti_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9ti/jvmti_zh_TW.nls b/runtime/nls/j9ti/jvmti_zh_TW.nls index a520c83c335..99de279d412 100644 --- a/runtime/nls/j9ti/jvmti_zh_TW.nls +++ b/runtime/nls/j9ti/jvmti_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JVMTI module. diff --git a/runtime/nls/j9vm/j9vm.nls b/runtime/nls/j9vm/j9vm.nls index f79f7fbb3a4..29ead402dab 100644 --- a/runtime/nls/j9vm/j9vm.nls +++ b/runtime/nls/j9vm/j9vm.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_ca.nls b/runtime/nls/j9vm/j9vm_ca.nls index 68331f8852a..a51f1296c04 100644 --- a/runtime/nls/j9vm/j9vm_ca.nls +++ b/runtime/nls/j9vm/j9vm_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_cs.nls b/runtime/nls/j9vm/j9vm_cs.nls index 6bfa32743a0..0a4477b159b 100644 --- a/runtime/nls/j9vm/j9vm_cs.nls +++ b/runtime/nls/j9vm/j9vm_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_de.nls b/runtime/nls/j9vm/j9vm_de.nls index f65e0f445f7..77d0635b343 100644 --- a/runtime/nls/j9vm/j9vm_de.nls +++ b/runtime/nls/j9vm/j9vm_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_es.nls b/runtime/nls/j9vm/j9vm_es.nls index 8983deea1a3..6aa2dea39f5 100644 --- a/runtime/nls/j9vm/j9vm_es.nls +++ b/runtime/nls/j9vm/j9vm_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_fr.nls b/runtime/nls/j9vm/j9vm_fr.nls index 504377da708..7f847214f03 100644 --- a/runtime/nls/j9vm/j9vm_fr.nls +++ b/runtime/nls/j9vm/j9vm_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_hu.nls b/runtime/nls/j9vm/j9vm_hu.nls index 8527b6568dd..e4abc0b508f 100644 --- a/runtime/nls/j9vm/j9vm_hu.nls +++ b/runtime/nls/j9vm/j9vm_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_it.nls b/runtime/nls/j9vm/j9vm_it.nls index d0b771938f4..474f600d929 100644 --- a/runtime/nls/j9vm/j9vm_it.nls +++ b/runtime/nls/j9vm/j9vm_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_ja.nls b/runtime/nls/j9vm/j9vm_ja.nls index 813d9c702c1..8d308ac562f 100644 --- a/runtime/nls/j9vm/j9vm_ja.nls +++ b/runtime/nls/j9vm/j9vm_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_ko.nls b/runtime/nls/j9vm/j9vm_ko.nls index 7de8384c76b..6f26d12a059 100644 --- a/runtime/nls/j9vm/j9vm_ko.nls +++ b/runtime/nls/j9vm/j9vm_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_pl.nls b/runtime/nls/j9vm/j9vm_pl.nls index a156c9694be..6ee8c0ec105 100644 --- a/runtime/nls/j9vm/j9vm_pl.nls +++ b/runtime/nls/j9vm/j9vm_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_pt_BR.nls b/runtime/nls/j9vm/j9vm_pt_BR.nls index 434e2e5f818..176e9ed2be8 100644 --- a/runtime/nls/j9vm/j9vm_pt_BR.nls +++ b/runtime/nls/j9vm/j9vm_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_ru.nls b/runtime/nls/j9vm/j9vm_ru.nls index dfcc50b6681..5f66b68fb28 100644 --- a/runtime/nls/j9vm/j9vm_ru.nls +++ b/runtime/nls/j9vm/j9vm_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_sk.nls b/runtime/nls/j9vm/j9vm_sk.nls index be10fa24800..831b7444e03 100644 --- a/runtime/nls/j9vm/j9vm_sk.nls +++ b/runtime/nls/j9vm/j9vm_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_sl.nls b/runtime/nls/j9vm/j9vm_sl.nls index 8f2931848ee..ca76e66d9dd 100644 --- a/runtime/nls/j9vm/j9vm_sl.nls +++ b/runtime/nls/j9vm/j9vm_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_tr.nls b/runtime/nls/j9vm/j9vm_tr.nls index 33d41b91796..dbc8806f120 100644 --- a/runtime/nls/j9vm/j9vm_tr.nls +++ b/runtime/nls/j9vm/j9vm_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_zh.nls b/runtime/nls/j9vm/j9vm_zh.nls index c2f93be235b..ac5aa283239 100644 --- a/runtime/nls/j9vm/j9vm_zh.nls +++ b/runtime/nls/j9vm/j9vm_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_zh_CN.nls b/runtime/nls/j9vm/j9vm_zh_CN.nls index c2f93be235b..ac5aa283239 100644 --- a/runtime/nls/j9vm/j9vm_zh_CN.nls +++ b/runtime/nls/j9vm/j9vm_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/j9vm/j9vm_zh_TW.nls b/runtime/nls/j9vm/j9vm_zh_TW.nls index 2626c30cfe3..30c86a0f109 100644 --- a/runtime/nls/j9vm/j9vm_zh_TW.nls +++ b/runtime/nls/j9vm/j9vm_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/jitm/j9jit.nls b/runtime/nls/jitm/j9jit.nls index fc5b713ee5b..75e8d9382d7 100644 --- a/runtime/nls/jitm/j9jit.nls +++ b/runtime/nls/jitm/j9jit.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_ca.nls b/runtime/nls/jitm/j9jit_ca.nls index 019f11b385c..dd09b4d3dd0 100644 --- a/runtime/nls/jitm/j9jit_ca.nls +++ b/runtime/nls/jitm/j9jit_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_cs.nls b/runtime/nls/jitm/j9jit_cs.nls index 19a8e4cf46c..665c63ffae1 100644 --- a/runtime/nls/jitm/j9jit_cs.nls +++ b/runtime/nls/jitm/j9jit_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_de.nls b/runtime/nls/jitm/j9jit_de.nls index 36e33e02451..3ba163acc0a 100644 --- a/runtime/nls/jitm/j9jit_de.nls +++ b/runtime/nls/jitm/j9jit_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_es.nls b/runtime/nls/jitm/j9jit_es.nls index 4751aacaf8a..ae6f5316abb 100644 --- a/runtime/nls/jitm/j9jit_es.nls +++ b/runtime/nls/jitm/j9jit_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_fr.nls b/runtime/nls/jitm/j9jit_fr.nls index 7afcb3b836d..b6454bd4dff 100644 --- a/runtime/nls/jitm/j9jit_fr.nls +++ b/runtime/nls/jitm/j9jit_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_hu.nls b/runtime/nls/jitm/j9jit_hu.nls index b0958e46e18..0d0079d14ee 100644 --- a/runtime/nls/jitm/j9jit_hu.nls +++ b/runtime/nls/jitm/j9jit_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_it.nls b/runtime/nls/jitm/j9jit_it.nls index 6a7fc2613ad..3556e1aa41e 100644 --- a/runtime/nls/jitm/j9jit_it.nls +++ b/runtime/nls/jitm/j9jit_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_ja.nls b/runtime/nls/jitm/j9jit_ja.nls index e6a16e45c2a..c26a851e100 100644 --- a/runtime/nls/jitm/j9jit_ja.nls +++ b/runtime/nls/jitm/j9jit_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_ko.nls b/runtime/nls/jitm/j9jit_ko.nls index f0df9272efb..34700fb0eac 100644 --- a/runtime/nls/jitm/j9jit_ko.nls +++ b/runtime/nls/jitm/j9jit_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_pl.nls b/runtime/nls/jitm/j9jit_pl.nls index 789c45b3f2d..4fdef683bcf 100644 --- a/runtime/nls/jitm/j9jit_pl.nls +++ b/runtime/nls/jitm/j9jit_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_pt_BR.nls b/runtime/nls/jitm/j9jit_pt_BR.nls index be6ae197e25..1eb5851ebab 100644 --- a/runtime/nls/jitm/j9jit_pt_BR.nls +++ b/runtime/nls/jitm/j9jit_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_ru.nls b/runtime/nls/jitm/j9jit_ru.nls index f43f1f46db1..002350ea243 100644 --- a/runtime/nls/jitm/j9jit_ru.nls +++ b/runtime/nls/jitm/j9jit_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_sk.nls b/runtime/nls/jitm/j9jit_sk.nls index 8758f767ac5..71084377e26 100644 --- a/runtime/nls/jitm/j9jit_sk.nls +++ b/runtime/nls/jitm/j9jit_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_sl.nls b/runtime/nls/jitm/j9jit_sl.nls index 804e75a0ed7..fc436bf483a 100644 --- a/runtime/nls/jitm/j9jit_sl.nls +++ b/runtime/nls/jitm/j9jit_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_tr.nls b/runtime/nls/jitm/j9jit_tr.nls index bc725f3979f..dfad50d1413 100644 --- a/runtime/nls/jitm/j9jit_tr.nls +++ b/runtime/nls/jitm/j9jit_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_zh.nls b/runtime/nls/jitm/j9jit_zh.nls index 9c69d4eb175..42dfda6d4e2 100644 --- a/runtime/nls/jitm/j9jit_zh.nls +++ b/runtime/nls/jitm/j9jit_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_zh_CN.nls b/runtime/nls/jitm/j9jit_zh_CN.nls index 9c69d4eb175..42dfda6d4e2 100644 --- a/runtime/nls/jitm/j9jit_zh_CN.nls +++ b/runtime/nls/jitm/j9jit_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jitm/j9jit_zh_TW.nls b/runtime/nls/jitm/j9jit_zh_TW.nls index d6cf71d1399..b76aebe4711 100644 --- a/runtime/nls/jitm/j9jit_zh_TW.nls +++ b/runtime/nls/jitm/j9jit_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JIT module. diff --git a/runtime/nls/jnck/jnichk.nls b/runtime/nls/jnck/jnichk.nls index 559c0ba7553..6a6221add9d 100644 --- a/runtime/nls/jnck/jnichk.nls +++ b/runtime/nls/jnck/jnichk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_ca.nls b/runtime/nls/jnck/jnichk_ca.nls index 73ae71b89bb..6ab1722bb90 100644 --- a/runtime/nls/jnck/jnichk_ca.nls +++ b/runtime/nls/jnck/jnichk_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_cs.nls b/runtime/nls/jnck/jnichk_cs.nls index cc8f09fa032..b9ad81589a0 100644 --- a/runtime/nls/jnck/jnichk_cs.nls +++ b/runtime/nls/jnck/jnichk_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_de.nls b/runtime/nls/jnck/jnichk_de.nls index 1b01bfe7a76..1aeec4532e6 100644 --- a/runtime/nls/jnck/jnichk_de.nls +++ b/runtime/nls/jnck/jnichk_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_es.nls b/runtime/nls/jnck/jnichk_es.nls index 03ea6579e2e..b66bd0274c1 100644 --- a/runtime/nls/jnck/jnichk_es.nls +++ b/runtime/nls/jnck/jnichk_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_fr.nls b/runtime/nls/jnck/jnichk_fr.nls index 7ac8ca64df5..7fde8252de2 100644 --- a/runtime/nls/jnck/jnichk_fr.nls +++ b/runtime/nls/jnck/jnichk_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_hu.nls b/runtime/nls/jnck/jnichk_hu.nls index 653c29a992e..ef02aa0ec6e 100644 --- a/runtime/nls/jnck/jnichk_hu.nls +++ b/runtime/nls/jnck/jnichk_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_it.nls b/runtime/nls/jnck/jnichk_it.nls index de6cc5ed8de..5341af6c8d7 100644 --- a/runtime/nls/jnck/jnichk_it.nls +++ b/runtime/nls/jnck/jnichk_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_ja.nls b/runtime/nls/jnck/jnichk_ja.nls index 5b2aa404f81..bc426dc1ea9 100644 --- a/runtime/nls/jnck/jnichk_ja.nls +++ b/runtime/nls/jnck/jnichk_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_ko.nls b/runtime/nls/jnck/jnichk_ko.nls index 37ae6f2f3da..f0b7565ea66 100644 --- a/runtime/nls/jnck/jnichk_ko.nls +++ b/runtime/nls/jnck/jnichk_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_pl.nls b/runtime/nls/jnck/jnichk_pl.nls index f41c2107d66..1bc05ce00e4 100644 --- a/runtime/nls/jnck/jnichk_pl.nls +++ b/runtime/nls/jnck/jnichk_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_pt_BR.nls b/runtime/nls/jnck/jnichk_pt_BR.nls index 668c7f5aa36..1d03548ae2c 100644 --- a/runtime/nls/jnck/jnichk_pt_BR.nls +++ b/runtime/nls/jnck/jnichk_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_ru.nls b/runtime/nls/jnck/jnichk_ru.nls index 03f709180b3..719c11ea340 100644 --- a/runtime/nls/jnck/jnichk_ru.nls +++ b/runtime/nls/jnck/jnichk_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_sk.nls b/runtime/nls/jnck/jnichk_sk.nls index 6790c108626..1be0a5637de 100644 --- a/runtime/nls/jnck/jnichk_sk.nls +++ b/runtime/nls/jnck/jnichk_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_sl.nls b/runtime/nls/jnck/jnichk_sl.nls index fb290fa1b82..eda2d941552 100644 --- a/runtime/nls/jnck/jnichk_sl.nls +++ b/runtime/nls/jnck/jnichk_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_tr.nls b/runtime/nls/jnck/jnichk_tr.nls index 5fb94741529..af6910bb7cf 100644 --- a/runtime/nls/jnck/jnichk_tr.nls +++ b/runtime/nls/jnck/jnichk_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_zh.nls b/runtime/nls/jnck/jnichk_zh.nls index 9b8d12b990a..d312df19dec 100644 --- a/runtime/nls/jnck/jnichk_zh.nls +++ b/runtime/nls/jnck/jnichk_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_zh_CN.nls b/runtime/nls/jnck/jnichk_zh_CN.nls index 9b8d12b990a..d312df19dec 100644 --- a/runtime/nls/jnck/jnichk_zh_CN.nls +++ b/runtime/nls/jnck/jnichk_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/jnck/jnichk_zh_TW.nls b/runtime/nls/jnck/jnichk_zh_TW.nls index 5e594148426..4a56f2b5a48 100644 --- a/runtime/nls/jnck/jnichk_zh_TW.nls +++ b/runtime/nls/jnck/jnichk_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the JNICHK module. diff --git a/runtime/nls/meck/memchk.nls b/runtime/nls/meck/memchk.nls index 777651e01d8..18fa7660201 100644 --- a/runtime/nls/meck/memchk.nls +++ b/runtime/nls/meck/memchk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_ca.nls b/runtime/nls/meck/memchk_ca.nls index 8c3154c8999..c861b1e1e5c 100644 --- a/runtime/nls/meck/memchk_ca.nls +++ b/runtime/nls/meck/memchk_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_cs.nls b/runtime/nls/meck/memchk_cs.nls index cf804e09f2f..9974eb25cbb 100644 --- a/runtime/nls/meck/memchk_cs.nls +++ b/runtime/nls/meck/memchk_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_de.nls b/runtime/nls/meck/memchk_de.nls index 542ba753439..95be58f6fa7 100644 --- a/runtime/nls/meck/memchk_de.nls +++ b/runtime/nls/meck/memchk_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_es.nls b/runtime/nls/meck/memchk_es.nls index 9cded18198d..ae0ab35a288 100644 --- a/runtime/nls/meck/memchk_es.nls +++ b/runtime/nls/meck/memchk_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_fr.nls b/runtime/nls/meck/memchk_fr.nls index 0166f27d621..8d0c4f8ca18 100644 --- a/runtime/nls/meck/memchk_fr.nls +++ b/runtime/nls/meck/memchk_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_hu.nls b/runtime/nls/meck/memchk_hu.nls index 42f3b52c0dd..a30398c955d 100644 --- a/runtime/nls/meck/memchk_hu.nls +++ b/runtime/nls/meck/memchk_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_it.nls b/runtime/nls/meck/memchk_it.nls index b5e67b6a94f..104629a422f 100644 --- a/runtime/nls/meck/memchk_it.nls +++ b/runtime/nls/meck/memchk_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_ja.nls b/runtime/nls/meck/memchk_ja.nls index fa81adca46a..8ecedcf7998 100644 --- a/runtime/nls/meck/memchk_ja.nls +++ b/runtime/nls/meck/memchk_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_ko.nls b/runtime/nls/meck/memchk_ko.nls index 471e3e5c7e3..4ee4eba97b6 100644 --- a/runtime/nls/meck/memchk_ko.nls +++ b/runtime/nls/meck/memchk_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_pl.nls b/runtime/nls/meck/memchk_pl.nls index 308794549f3..481a10ea973 100644 --- a/runtime/nls/meck/memchk_pl.nls +++ b/runtime/nls/meck/memchk_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_pt_BR.nls b/runtime/nls/meck/memchk_pt_BR.nls index a84f5dadb2c..bb6dccb2e8e 100644 --- a/runtime/nls/meck/memchk_pt_BR.nls +++ b/runtime/nls/meck/memchk_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_ru.nls b/runtime/nls/meck/memchk_ru.nls index 9d04cc5b1ce..be12a776a23 100644 --- a/runtime/nls/meck/memchk_ru.nls +++ b/runtime/nls/meck/memchk_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_sk.nls b/runtime/nls/meck/memchk_sk.nls index ad87361b123..5c9455d0458 100644 --- a/runtime/nls/meck/memchk_sk.nls +++ b/runtime/nls/meck/memchk_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_sl.nls b/runtime/nls/meck/memchk_sl.nls index a840c9b0d4f..a0180093387 100644 --- a/runtime/nls/meck/memchk_sl.nls +++ b/runtime/nls/meck/memchk_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_tr.nls b/runtime/nls/meck/memchk_tr.nls index f7950c00623..946eefb4e9e 100644 --- a/runtime/nls/meck/memchk_tr.nls +++ b/runtime/nls/meck/memchk_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_zh.nls b/runtime/nls/meck/memchk_zh.nls index ff142f1b7f3..8d6bb7c366b 100644 --- a/runtime/nls/meck/memchk_zh.nls +++ b/runtime/nls/meck/memchk_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_zh_CN.nls b/runtime/nls/meck/memchk_zh_CN.nls index ff142f1b7f3..8d6bb7c366b 100644 --- a/runtime/nls/meck/memchk_zh_CN.nls +++ b/runtime/nls/meck/memchk_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/meck/memchk_zh_TW.nls b/runtime/nls/meck/memchk_zh_TW.nls index eef69c6f2c2..9b34f838f41 100644 --- a/runtime/nls/meck/memchk_zh_TW.nls +++ b/runtime/nls/meck/memchk_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # diff --git a/runtime/nls/port/port.nls b/runtime/nls/port/port.nls index 2067b003fc6..d9c1d2b217a 100644 --- a/runtime/nls/port/port.nls +++ b/runtime/nls/port/port.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_ca.nls b/runtime/nls/port/port_ca.nls index c38d4d22b10..2b5c7b0c457 100644 --- a/runtime/nls/port/port_ca.nls +++ b/runtime/nls/port/port_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_cs.nls b/runtime/nls/port/port_cs.nls index ab4c4c58600..417fb937eb4 100644 --- a/runtime/nls/port/port_cs.nls +++ b/runtime/nls/port/port_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_de.nls b/runtime/nls/port/port_de.nls index 0abfcd75d0d..6333ef11791 100644 --- a/runtime/nls/port/port_de.nls +++ b/runtime/nls/port/port_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_es.nls b/runtime/nls/port/port_es.nls index f3186472c5a..03838acf126 100644 --- a/runtime/nls/port/port_es.nls +++ b/runtime/nls/port/port_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_fr.nls b/runtime/nls/port/port_fr.nls index 9ebeee513f8..fd4b6814cc1 100644 --- a/runtime/nls/port/port_fr.nls +++ b/runtime/nls/port/port_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_hu.nls b/runtime/nls/port/port_hu.nls index d428a859d1a..7d89ceadc8f 100644 --- a/runtime/nls/port/port_hu.nls +++ b/runtime/nls/port/port_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_it.nls b/runtime/nls/port/port_it.nls index 51f71ce7a60..6e2beba6f13 100644 --- a/runtime/nls/port/port_it.nls +++ b/runtime/nls/port/port_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_ja.nls b/runtime/nls/port/port_ja.nls index 4ae7b6aecdb..91bd484b7b9 100644 --- a/runtime/nls/port/port_ja.nls +++ b/runtime/nls/port/port_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_ko.nls b/runtime/nls/port/port_ko.nls index cf23e8ec284..15118feabfc 100644 --- a/runtime/nls/port/port_ko.nls +++ b/runtime/nls/port/port_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_pl.nls b/runtime/nls/port/port_pl.nls index 47b8536cfbe..ef5ab2b158d 100644 --- a/runtime/nls/port/port_pl.nls +++ b/runtime/nls/port/port_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_pt_BR.nls b/runtime/nls/port/port_pt_BR.nls index c38c3a3bd77..03b0b6616f2 100644 --- a/runtime/nls/port/port_pt_BR.nls +++ b/runtime/nls/port/port_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_ru.nls b/runtime/nls/port/port_ru.nls index c92284d2a34..88a68594964 100644 --- a/runtime/nls/port/port_ru.nls +++ b/runtime/nls/port/port_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_sk.nls b/runtime/nls/port/port_sk.nls index 6ee5cf90e5e..178585c6ec1 100644 --- a/runtime/nls/port/port_sk.nls +++ b/runtime/nls/port/port_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_sl.nls b/runtime/nls/port/port_sl.nls index c67585accd8..ddc1494ef7b 100644 --- a/runtime/nls/port/port_sl.nls +++ b/runtime/nls/port/port_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_tr.nls b/runtime/nls/port/port_tr.nls index fd341c9e7bc..03b8f12ce09 100644 --- a/runtime/nls/port/port_tr.nls +++ b/runtime/nls/port/port_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_zh.nls b/runtime/nls/port/port_zh.nls index 29351d57bca..364b96f9137 100644 --- a/runtime/nls/port/port_zh.nls +++ b/runtime/nls/port/port_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_zh_CN.nls b/runtime/nls/port/port_zh_CN.nls index 29351d57bca..364b96f9137 100644 --- a/runtime/nls/port/port_zh_CN.nls +++ b/runtime/nls/port/port_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/port/port_zh_TW.nls b/runtime/nls/port/port_zh_TW.nls index 84538669811..2e1379914a1 100644 --- a/runtime/nls/port/port_zh_TW.nls +++ b/runtime/nls/port/port_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for common elements of the port library diff --git a/runtime/nls/shrc/j9shr.nls b/runtime/nls/shrc/j9shr.nls index 1cc0b0faef4..d3df194a75c 100644 --- a/runtime/nls/shrc/j9shr.nls +++ b/runtime/nls/shrc/j9shr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_ca.nls b/runtime/nls/shrc/j9shr_ca.nls index b03045bbba7..e3f9e213b78 100644 --- a/runtime/nls/shrc/j9shr_ca.nls +++ b/runtime/nls/shrc/j9shr_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_cs.nls b/runtime/nls/shrc/j9shr_cs.nls index 7b1925d05c8..c49cc5f5e6b 100644 --- a/runtime/nls/shrc/j9shr_cs.nls +++ b/runtime/nls/shrc/j9shr_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_de.nls b/runtime/nls/shrc/j9shr_de.nls index 8d823325377..08a80787e4d 100644 --- a/runtime/nls/shrc/j9shr_de.nls +++ b/runtime/nls/shrc/j9shr_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_es.nls b/runtime/nls/shrc/j9shr_es.nls index 6e9bca0596f..be1a6728215 100644 --- a/runtime/nls/shrc/j9shr_es.nls +++ b/runtime/nls/shrc/j9shr_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_fr.nls b/runtime/nls/shrc/j9shr_fr.nls index 6ca979927f5..9a53b1c7a49 100644 --- a/runtime/nls/shrc/j9shr_fr.nls +++ b/runtime/nls/shrc/j9shr_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_hu.nls b/runtime/nls/shrc/j9shr_hu.nls index 9a0fc89833d..096f0dd72eb 100644 --- a/runtime/nls/shrc/j9shr_hu.nls +++ b/runtime/nls/shrc/j9shr_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_it.nls b/runtime/nls/shrc/j9shr_it.nls index 7cb9513f685..e4c5e4c2a1a 100644 --- a/runtime/nls/shrc/j9shr_it.nls +++ b/runtime/nls/shrc/j9shr_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_ja.nls b/runtime/nls/shrc/j9shr_ja.nls index 3ad34315fe9..8f79a061ce5 100644 --- a/runtime/nls/shrc/j9shr_ja.nls +++ b/runtime/nls/shrc/j9shr_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_ko.nls b/runtime/nls/shrc/j9shr_ko.nls index 1284087ce64..e7c7db2c141 100644 --- a/runtime/nls/shrc/j9shr_ko.nls +++ b/runtime/nls/shrc/j9shr_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_pl.nls b/runtime/nls/shrc/j9shr_pl.nls index 93f344eaa6b..439a2b5ee0e 100644 --- a/runtime/nls/shrc/j9shr_pl.nls +++ b/runtime/nls/shrc/j9shr_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_pt_BR.nls b/runtime/nls/shrc/j9shr_pt_BR.nls index 716baf1c6de..16b2046000b 100644 --- a/runtime/nls/shrc/j9shr_pt_BR.nls +++ b/runtime/nls/shrc/j9shr_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_ru.nls b/runtime/nls/shrc/j9shr_ru.nls index af816d79851..22c2f9afefd 100644 --- a/runtime/nls/shrc/j9shr_ru.nls +++ b/runtime/nls/shrc/j9shr_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_sk.nls b/runtime/nls/shrc/j9shr_sk.nls index 06825695d59..ee8e0bc56a4 100644 --- a/runtime/nls/shrc/j9shr_sk.nls +++ b/runtime/nls/shrc/j9shr_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_sl.nls b/runtime/nls/shrc/j9shr_sl.nls index d6ae34135ac..2ba7b1d077f 100644 --- a/runtime/nls/shrc/j9shr_sl.nls +++ b/runtime/nls/shrc/j9shr_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_tr.nls b/runtime/nls/shrc/j9shr_tr.nls index 08e37bb6a70..52472330d40 100644 --- a/runtime/nls/shrc/j9shr_tr.nls +++ b/runtime/nls/shrc/j9shr_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_zh.nls b/runtime/nls/shrc/j9shr_zh.nls index ce8558e80f4..47b9d94de18 100644 --- a/runtime/nls/shrc/j9shr_zh.nls +++ b/runtime/nls/shrc/j9shr_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_zh_CN.nls b/runtime/nls/shrc/j9shr_zh_CN.nls index 246b6cf6e64..de859a82ddd 100644 --- a/runtime/nls/shrc/j9shr_zh_CN.nls +++ b/runtime/nls/shrc/j9shr_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/shrc/j9shr_zh_TW.nls b/runtime/nls/shrc/j9shr_zh_TW.nls index adb35b3b8d5..07f750f03e4 100644 --- a/runtime/nls/shrc/j9shr_zh_TW.nls +++ b/runtime/nls/shrc/j9shr_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # j9shr.nls diff --git a/runtime/nls/smap/stackmap.nls b/runtime/nls/smap/stackmap.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap.nls +++ b/runtime/nls/smap/stackmap.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_ca.nls b/runtime/nls/smap/stackmap_ca.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_ca.nls +++ b/runtime/nls/smap/stackmap_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_cs.nls b/runtime/nls/smap/stackmap_cs.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_cs.nls +++ b/runtime/nls/smap/stackmap_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_de.nls b/runtime/nls/smap/stackmap_de.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_de.nls +++ b/runtime/nls/smap/stackmap_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_es.nls b/runtime/nls/smap/stackmap_es.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_es.nls +++ b/runtime/nls/smap/stackmap_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_fr.nls b/runtime/nls/smap/stackmap_fr.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_fr.nls +++ b/runtime/nls/smap/stackmap_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_hu.nls b/runtime/nls/smap/stackmap_hu.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_hu.nls +++ b/runtime/nls/smap/stackmap_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_it.nls b/runtime/nls/smap/stackmap_it.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_it.nls +++ b/runtime/nls/smap/stackmap_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_ja.nls b/runtime/nls/smap/stackmap_ja.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_ja.nls +++ b/runtime/nls/smap/stackmap_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_ko.nls b/runtime/nls/smap/stackmap_ko.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_ko.nls +++ b/runtime/nls/smap/stackmap_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_pl.nls b/runtime/nls/smap/stackmap_pl.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_pl.nls +++ b/runtime/nls/smap/stackmap_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_pt_BR.nls b/runtime/nls/smap/stackmap_pt_BR.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_pt_BR.nls +++ b/runtime/nls/smap/stackmap_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_ru.nls b/runtime/nls/smap/stackmap_ru.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_ru.nls +++ b/runtime/nls/smap/stackmap_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_sk.nls b/runtime/nls/smap/stackmap_sk.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_sk.nls +++ b/runtime/nls/smap/stackmap_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_sl.nls b/runtime/nls/smap/stackmap_sl.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_sl.nls +++ b/runtime/nls/smap/stackmap_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_tr.nls b/runtime/nls/smap/stackmap_tr.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_tr.nls +++ b/runtime/nls/smap/stackmap_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_zh.nls b/runtime/nls/smap/stackmap_zh.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_zh.nls +++ b/runtime/nls/smap/stackmap_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_zh_CN.nls b/runtime/nls/smap/stackmap_zh_CN.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_zh_CN.nls +++ b/runtime/nls/smap/stackmap_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/smap/stackmap_zh_TW.nls b/runtime/nls/smap/stackmap_zh_TW.nls index 1bda25c56c3..95f80d8418a 100644 --- a/runtime/nls/smap/stackmap_zh_TW.nls +++ b/runtime/nls/smap/stackmap_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Stack Mapper diff --git a/runtime/nls/trace/j9trc.nls b/runtime/nls/trace/j9trc.nls index f04243b59a5..c8998efb4ea 100644 --- a/runtime/nls/trace/j9trc.nls +++ b/runtime/nls/trace/j9trc.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_ca.nls b/runtime/nls/trace/j9trc_ca.nls index fd09ecf29b7..f6ea7308b83 100644 --- a/runtime/nls/trace/j9trc_ca.nls +++ b/runtime/nls/trace/j9trc_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_cs.nls b/runtime/nls/trace/j9trc_cs.nls index 5e458afc5e6..f4c9db63dc3 100644 --- a/runtime/nls/trace/j9trc_cs.nls +++ b/runtime/nls/trace/j9trc_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_de.nls b/runtime/nls/trace/j9trc_de.nls index 575e693f11c..5545578a970 100644 --- a/runtime/nls/trace/j9trc_de.nls +++ b/runtime/nls/trace/j9trc_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_es.nls b/runtime/nls/trace/j9trc_es.nls index f8b0fca7a2b..73db6377606 100644 --- a/runtime/nls/trace/j9trc_es.nls +++ b/runtime/nls/trace/j9trc_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_fr.nls b/runtime/nls/trace/j9trc_fr.nls index 9e5c5d11a22..98ecee27ac2 100644 --- a/runtime/nls/trace/j9trc_fr.nls +++ b/runtime/nls/trace/j9trc_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_hu.nls b/runtime/nls/trace/j9trc_hu.nls index 4387a17ed34..947bf962a08 100644 --- a/runtime/nls/trace/j9trc_hu.nls +++ b/runtime/nls/trace/j9trc_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_it.nls b/runtime/nls/trace/j9trc_it.nls index 32eded0e256..47260e9fb01 100644 --- a/runtime/nls/trace/j9trc_it.nls +++ b/runtime/nls/trace/j9trc_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_ja.nls b/runtime/nls/trace/j9trc_ja.nls index 37eec36b123..553b872a3e9 100644 --- a/runtime/nls/trace/j9trc_ja.nls +++ b/runtime/nls/trace/j9trc_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_ko.nls b/runtime/nls/trace/j9trc_ko.nls index 19cdbb411ea..177dca536ac 100644 --- a/runtime/nls/trace/j9trc_ko.nls +++ b/runtime/nls/trace/j9trc_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_pl.nls b/runtime/nls/trace/j9trc_pl.nls index 7406c562dce..f681e6f77f1 100644 --- a/runtime/nls/trace/j9trc_pl.nls +++ b/runtime/nls/trace/j9trc_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_pt_BR.nls b/runtime/nls/trace/j9trc_pt_BR.nls index b33d03c5fd3..a293bfb700c 100644 --- a/runtime/nls/trace/j9trc_pt_BR.nls +++ b/runtime/nls/trace/j9trc_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_ru.nls b/runtime/nls/trace/j9trc_ru.nls index b87299e00a4..638f6ba5206 100644 --- a/runtime/nls/trace/j9trc_ru.nls +++ b/runtime/nls/trace/j9trc_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_sk.nls b/runtime/nls/trace/j9trc_sk.nls index fd954330b14..11365dc0daa 100644 --- a/runtime/nls/trace/j9trc_sk.nls +++ b/runtime/nls/trace/j9trc_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_sl.nls b/runtime/nls/trace/j9trc_sl.nls index 1bde5a28a14..9238131357d 100644 --- a/runtime/nls/trace/j9trc_sl.nls +++ b/runtime/nls/trace/j9trc_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_tr.nls b/runtime/nls/trace/j9trc_tr.nls index a79a560c188..992e390458c 100644 --- a/runtime/nls/trace/j9trc_tr.nls +++ b/runtime/nls/trace/j9trc_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_zh.nls b/runtime/nls/trace/j9trc_zh.nls index 681d1610153..bf1c51ba329 100644 --- a/runtime/nls/trace/j9trc_zh.nls +++ b/runtime/nls/trace/j9trc_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_zh_CN.nls b/runtime/nls/trace/j9trc_zh_CN.nls index 681d1610153..bf1c51ba329 100644 --- a/runtime/nls/trace/j9trc_zh_CN.nls +++ b/runtime/nls/trace/j9trc_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/trace/j9trc_zh_TW.nls b/runtime/nls/trace/j9trc_zh_TW.nls index 9efa3588180..2614f536424 100644 --- a/runtime/nls/trace/j9trc_zh_TW.nls +++ b/runtime/nls/trace/j9trc_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the RAStrace module. diff --git a/runtime/nls/verb/verbose.nls b/runtime/nls/verb/verbose.nls index 3fb86abbed3..dd61e0ed52f 100644 --- a/runtime/nls/verb/verbose.nls +++ b/runtime/nls/verb/verbose.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_ca.nls b/runtime/nls/verb/verbose_ca.nls index e6a2600be38..9424a4043c3 100644 --- a/runtime/nls/verb/verbose_ca.nls +++ b/runtime/nls/verb/verbose_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_cs.nls b/runtime/nls/verb/verbose_cs.nls index d77f1c680b8..8a972545198 100644 --- a/runtime/nls/verb/verbose_cs.nls +++ b/runtime/nls/verb/verbose_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_de.nls b/runtime/nls/verb/verbose_de.nls index eb1be9a6bc8..35c27fc65cf 100644 --- a/runtime/nls/verb/verbose_de.nls +++ b/runtime/nls/verb/verbose_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_es.nls b/runtime/nls/verb/verbose_es.nls index 569bc42c85c..09254965d12 100644 --- a/runtime/nls/verb/verbose_es.nls +++ b/runtime/nls/verb/verbose_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_fr.nls b/runtime/nls/verb/verbose_fr.nls index 059846e19bd..1865ed301aa 100644 --- a/runtime/nls/verb/verbose_fr.nls +++ b/runtime/nls/verb/verbose_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_hu.nls b/runtime/nls/verb/verbose_hu.nls index 2e858df4b3f..af30b5356f6 100644 --- a/runtime/nls/verb/verbose_hu.nls +++ b/runtime/nls/verb/verbose_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_it.nls b/runtime/nls/verb/verbose_it.nls index 4c5a619dfc3..b1eb3493b23 100644 --- a/runtime/nls/verb/verbose_it.nls +++ b/runtime/nls/verb/verbose_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_ja.nls b/runtime/nls/verb/verbose_ja.nls index 5d900d6ea80..2d085802484 100644 --- a/runtime/nls/verb/verbose_ja.nls +++ b/runtime/nls/verb/verbose_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_ko.nls b/runtime/nls/verb/verbose_ko.nls index 12977bedc6c..af4a65b30aa 100644 --- a/runtime/nls/verb/verbose_ko.nls +++ b/runtime/nls/verb/verbose_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_pl.nls b/runtime/nls/verb/verbose_pl.nls index 192fe0ca5ad..8a5a60921cd 100644 --- a/runtime/nls/verb/verbose_pl.nls +++ b/runtime/nls/verb/verbose_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_pt_BR.nls b/runtime/nls/verb/verbose_pt_BR.nls index f05e3726634..185ab539dd8 100644 --- a/runtime/nls/verb/verbose_pt_BR.nls +++ b/runtime/nls/verb/verbose_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_ru.nls b/runtime/nls/verb/verbose_ru.nls index eb3ce783f2a..d12220842d1 100644 --- a/runtime/nls/verb/verbose_ru.nls +++ b/runtime/nls/verb/verbose_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_sk.nls b/runtime/nls/verb/verbose_sk.nls index 89c320de841..f482ac27c27 100644 --- a/runtime/nls/verb/verbose_sk.nls +++ b/runtime/nls/verb/verbose_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_sl.nls b/runtime/nls/verb/verbose_sl.nls index 9b202565139..2d6f21a95b5 100644 --- a/runtime/nls/verb/verbose_sl.nls +++ b/runtime/nls/verb/verbose_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_tr.nls b/runtime/nls/verb/verbose_tr.nls index 0758648af08..b590d23b785 100644 --- a/runtime/nls/verb/verbose_tr.nls +++ b/runtime/nls/verb/verbose_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_zh.nls b/runtime/nls/verb/verbose_zh.nls index b16bdae76c3..b18584f840a 100644 --- a/runtime/nls/verb/verbose_zh.nls +++ b/runtime/nls/verb/verbose_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_zh_CN.nls b/runtime/nls/verb/verbose_zh_CN.nls index b16bdae76c3..b18584f840a 100644 --- a/runtime/nls/verb/verbose_zh_CN.nls +++ b/runtime/nls/verb/verbose_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/verb/verbose_zh_TW.nls b/runtime/nls/verb/verbose_zh_TW.nls index d9778788925..afd5a182798 100644 --- a/runtime/nls/verb/verbose_zh_TW.nls +++ b/runtime/nls/verb/verbose_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the verbose module. diff --git a/runtime/nls/vmut/j9vmutil.nls b/runtime/nls/vmut/j9vmutil.nls index e154c252dd1..3104e47e4be 100644 --- a/runtime/nls/vmut/j9vmutil.nls +++ b/runtime/nls/vmut/j9vmutil.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_ca.nls b/runtime/nls/vmut/j9vmutil_ca.nls index e3311b552aa..ba04c8ff910 100644 --- a/runtime/nls/vmut/j9vmutil_ca.nls +++ b/runtime/nls/vmut/j9vmutil_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_cs.nls b/runtime/nls/vmut/j9vmutil_cs.nls index 0e0162223db..a7502885478 100644 --- a/runtime/nls/vmut/j9vmutil_cs.nls +++ b/runtime/nls/vmut/j9vmutil_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_de.nls b/runtime/nls/vmut/j9vmutil_de.nls index 42acc3b0eb5..8e29be01217 100644 --- a/runtime/nls/vmut/j9vmutil_de.nls +++ b/runtime/nls/vmut/j9vmutil_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_es.nls b/runtime/nls/vmut/j9vmutil_es.nls index 7368b1eb2ac..e1cab083594 100644 --- a/runtime/nls/vmut/j9vmutil_es.nls +++ b/runtime/nls/vmut/j9vmutil_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_fr.nls b/runtime/nls/vmut/j9vmutil_fr.nls index eba323f1bdb..a61d73b61f7 100644 --- a/runtime/nls/vmut/j9vmutil_fr.nls +++ b/runtime/nls/vmut/j9vmutil_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_hu.nls b/runtime/nls/vmut/j9vmutil_hu.nls index 9cf72bf5dc2..732ee8de194 100644 --- a/runtime/nls/vmut/j9vmutil_hu.nls +++ b/runtime/nls/vmut/j9vmutil_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_it.nls b/runtime/nls/vmut/j9vmutil_it.nls index 71cc2a0b974..9229197c64a 100644 --- a/runtime/nls/vmut/j9vmutil_it.nls +++ b/runtime/nls/vmut/j9vmutil_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_ja.nls b/runtime/nls/vmut/j9vmutil_ja.nls index 43fc40628e3..6a13064b348 100644 --- a/runtime/nls/vmut/j9vmutil_ja.nls +++ b/runtime/nls/vmut/j9vmutil_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_ko.nls b/runtime/nls/vmut/j9vmutil_ko.nls index 747ff54ef83..771b7f66f93 100644 --- a/runtime/nls/vmut/j9vmutil_ko.nls +++ b/runtime/nls/vmut/j9vmutil_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_pl.nls b/runtime/nls/vmut/j9vmutil_pl.nls index 03dbca99a63..0625f7df86e 100644 --- a/runtime/nls/vmut/j9vmutil_pl.nls +++ b/runtime/nls/vmut/j9vmutil_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_pt_BR.nls b/runtime/nls/vmut/j9vmutil_pt_BR.nls index 1b1be6b7b33..1aef11f83a7 100644 --- a/runtime/nls/vmut/j9vmutil_pt_BR.nls +++ b/runtime/nls/vmut/j9vmutil_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_ru.nls b/runtime/nls/vmut/j9vmutil_ru.nls index 6d961a41776..7c88dd4e261 100644 --- a/runtime/nls/vmut/j9vmutil_ru.nls +++ b/runtime/nls/vmut/j9vmutil_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_sk.nls b/runtime/nls/vmut/j9vmutil_sk.nls index 53b2a1dca2f..9415829995b 100644 --- a/runtime/nls/vmut/j9vmutil_sk.nls +++ b/runtime/nls/vmut/j9vmutil_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_sl.nls b/runtime/nls/vmut/j9vmutil_sl.nls index b85085841ca..30ae0fcfd05 100644 --- a/runtime/nls/vmut/j9vmutil_sl.nls +++ b/runtime/nls/vmut/j9vmutil_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_tr.nls b/runtime/nls/vmut/j9vmutil_tr.nls index 92352b78021..f41091f41a7 100644 --- a/runtime/nls/vmut/j9vmutil_tr.nls +++ b/runtime/nls/vmut/j9vmutil_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_zh.nls b/runtime/nls/vmut/j9vmutil_zh.nls index 053c428f8ab..fac031601a8 100644 --- a/runtime/nls/vmut/j9vmutil_zh.nls +++ b/runtime/nls/vmut/j9vmutil_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_zh_CN.nls b/runtime/nls/vmut/j9vmutil_zh_CN.nls index 053c428f8ab..fac031601a8 100644 --- a/runtime/nls/vmut/j9vmutil_zh_CN.nls +++ b/runtime/nls/vmut/j9vmutil_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vmut/j9vmutil_zh_TW.nls b/runtime/nls/vmut/j9vmutil_zh_TW.nls index 69228403929..931cb88372c 100644 --- a/runtime/nls/vmut/j9vmutil_zh_TW.nls +++ b/runtime/nls/vmut/j9vmutil_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM module. diff --git a/runtime/nls/vrfy/j9bcv.nls b/runtime/nls/vrfy/j9bcv.nls index 9b9047e42fc..089b8a8d19d 100644 --- a/runtime/nls/vrfy/j9bcv.nls +++ b/runtime/nls/vrfy/j9bcv.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_ca.nls b/runtime/nls/vrfy/j9bcv_ca.nls index 09a0ae10156..fedce949e13 100644 --- a/runtime/nls/vrfy/j9bcv_ca.nls +++ b/runtime/nls/vrfy/j9bcv_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_cs.nls b/runtime/nls/vrfy/j9bcv_cs.nls index 0d766b45cbc..620078fba43 100644 --- a/runtime/nls/vrfy/j9bcv_cs.nls +++ b/runtime/nls/vrfy/j9bcv_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_de.nls b/runtime/nls/vrfy/j9bcv_de.nls index 5e3b563dd99..d34718ef1cb 100644 --- a/runtime/nls/vrfy/j9bcv_de.nls +++ b/runtime/nls/vrfy/j9bcv_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_es.nls b/runtime/nls/vrfy/j9bcv_es.nls index a153ce40400..ef762f3a880 100644 --- a/runtime/nls/vrfy/j9bcv_es.nls +++ b/runtime/nls/vrfy/j9bcv_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_fr.nls b/runtime/nls/vrfy/j9bcv_fr.nls index 26cce84762b..241623296aa 100644 --- a/runtime/nls/vrfy/j9bcv_fr.nls +++ b/runtime/nls/vrfy/j9bcv_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_hu.nls b/runtime/nls/vrfy/j9bcv_hu.nls index dac4a5c1beb..0d751c58f93 100644 --- a/runtime/nls/vrfy/j9bcv_hu.nls +++ b/runtime/nls/vrfy/j9bcv_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_it.nls b/runtime/nls/vrfy/j9bcv_it.nls index b4150f21662..b4a3bfce8a3 100644 --- a/runtime/nls/vrfy/j9bcv_it.nls +++ b/runtime/nls/vrfy/j9bcv_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_ja.nls b/runtime/nls/vrfy/j9bcv_ja.nls index a810f1966ed..7f5c277b63d 100644 --- a/runtime/nls/vrfy/j9bcv_ja.nls +++ b/runtime/nls/vrfy/j9bcv_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_ko.nls b/runtime/nls/vrfy/j9bcv_ko.nls index e1bf20bdd8d..455bd09afdb 100644 --- a/runtime/nls/vrfy/j9bcv_ko.nls +++ b/runtime/nls/vrfy/j9bcv_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_pl.nls b/runtime/nls/vrfy/j9bcv_pl.nls index 82ebe3d65af..20191d7115b 100644 --- a/runtime/nls/vrfy/j9bcv_pl.nls +++ b/runtime/nls/vrfy/j9bcv_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_pt_BR.nls b/runtime/nls/vrfy/j9bcv_pt_BR.nls index 2359b18d802..c3ce9df41b6 100644 --- a/runtime/nls/vrfy/j9bcv_pt_BR.nls +++ b/runtime/nls/vrfy/j9bcv_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_ru.nls b/runtime/nls/vrfy/j9bcv_ru.nls index decfd1793e2..705c53243e3 100644 --- a/runtime/nls/vrfy/j9bcv_ru.nls +++ b/runtime/nls/vrfy/j9bcv_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_sk.nls b/runtime/nls/vrfy/j9bcv_sk.nls index 6914c3fb255..d95d0043ba4 100644 --- a/runtime/nls/vrfy/j9bcv_sk.nls +++ b/runtime/nls/vrfy/j9bcv_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_sl.nls b/runtime/nls/vrfy/j9bcv_sl.nls index 16a0af29e6f..0d66661c445 100644 --- a/runtime/nls/vrfy/j9bcv_sl.nls +++ b/runtime/nls/vrfy/j9bcv_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_tr.nls b/runtime/nls/vrfy/j9bcv_tr.nls index 3f7ea4109cc..fe343ec3416 100644 --- a/runtime/nls/vrfy/j9bcv_tr.nls +++ b/runtime/nls/vrfy/j9bcv_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_zh.nls b/runtime/nls/vrfy/j9bcv_zh.nls index f520b1f204b..0fd8497c541 100644 --- a/runtime/nls/vrfy/j9bcv_zh.nls +++ b/runtime/nls/vrfy/j9bcv_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_zh_CN.nls b/runtime/nls/vrfy/j9bcv_zh_CN.nls index f520b1f204b..0fd8497c541 100644 --- a/runtime/nls/vrfy/j9bcv_zh_CN.nls +++ b/runtime/nls/vrfy/j9bcv_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/vrfy/j9bcv_zh_TW.nls b/runtime/nls/vrfy/j9bcv_zh_TW.nls index 86464ca5db5..bcec9ddb0ff 100644 --- a/runtime/nls/vrfy/j9bcv_zh_TW.nls +++ b/runtime/nls/vrfy/j9bcv_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the Bytecode Verification errors. diff --git a/runtime/nls/zips/j9zip.nls b/runtime/nls/zips/j9zip.nls index fceb2abe0bb..c007740497e 100644 --- a/runtime/nls/zips/j9zip.nls +++ b/runtime/nls/zips/j9zip.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_ca.nls b/runtime/nls/zips/j9zip_ca.nls index 65abb027f51..ad8905059db 100644 --- a/runtime/nls/zips/j9zip_ca.nls +++ b/runtime/nls/zips/j9zip_ca.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_cs.nls b/runtime/nls/zips/j9zip_cs.nls index c258c089691..2d92fb37ada 100644 --- a/runtime/nls/zips/j9zip_cs.nls +++ b/runtime/nls/zips/j9zip_cs.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_de.nls b/runtime/nls/zips/j9zip_de.nls index aa040e15046..ba1e5e8ab55 100644 --- a/runtime/nls/zips/j9zip_de.nls +++ b/runtime/nls/zips/j9zip_de.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_es.nls b/runtime/nls/zips/j9zip_es.nls index d7ab101bb37..776e0d18b82 100644 --- a/runtime/nls/zips/j9zip_es.nls +++ b/runtime/nls/zips/j9zip_es.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_fr.nls b/runtime/nls/zips/j9zip_fr.nls index 8744225b584..fe44ce9aa72 100644 --- a/runtime/nls/zips/j9zip_fr.nls +++ b/runtime/nls/zips/j9zip_fr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_hu.nls b/runtime/nls/zips/j9zip_hu.nls index 2d8e354048c..a3767e89680 100644 --- a/runtime/nls/zips/j9zip_hu.nls +++ b/runtime/nls/zips/j9zip_hu.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_it.nls b/runtime/nls/zips/j9zip_it.nls index f21a1806bdd..14911dcf849 100644 --- a/runtime/nls/zips/j9zip_it.nls +++ b/runtime/nls/zips/j9zip_it.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_ja.nls b/runtime/nls/zips/j9zip_ja.nls index 15cad03138b..da914742385 100644 --- a/runtime/nls/zips/j9zip_ja.nls +++ b/runtime/nls/zips/j9zip_ja.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_ko.nls b/runtime/nls/zips/j9zip_ko.nls index 677e3e648e5..1db75b45ae0 100644 --- a/runtime/nls/zips/j9zip_ko.nls +++ b/runtime/nls/zips/j9zip_ko.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_pl.nls b/runtime/nls/zips/j9zip_pl.nls index 1f583037286..7c6679f6f9c 100644 --- a/runtime/nls/zips/j9zip_pl.nls +++ b/runtime/nls/zips/j9zip_pl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_pt_BR.nls b/runtime/nls/zips/j9zip_pt_BR.nls index 0dab67b4258..52c70e8d8f1 100644 --- a/runtime/nls/zips/j9zip_pt_BR.nls +++ b/runtime/nls/zips/j9zip_pt_BR.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_ru.nls b/runtime/nls/zips/j9zip_ru.nls index 464accc95d1..4ed625c4ee6 100644 --- a/runtime/nls/zips/j9zip_ru.nls +++ b/runtime/nls/zips/j9zip_ru.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_sk.nls b/runtime/nls/zips/j9zip_sk.nls index b65082f66a5..fea9fbbd477 100644 --- a/runtime/nls/zips/j9zip_sk.nls +++ b/runtime/nls/zips/j9zip_sk.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_sl.nls b/runtime/nls/zips/j9zip_sl.nls index 629a6e87553..e57d98c0df4 100644 --- a/runtime/nls/zips/j9zip_sl.nls +++ b/runtime/nls/zips/j9zip_sl.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_tr.nls b/runtime/nls/zips/j9zip_tr.nls index 45703646c22..3bd0b3adf52 100644 --- a/runtime/nls/zips/j9zip_tr.nls +++ b/runtime/nls/zips/j9zip_tr.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_zh.nls b/runtime/nls/zips/j9zip_zh.nls index 716b652d32f..9db6cf70e81 100644 --- a/runtime/nls/zips/j9zip_zh.nls +++ b/runtime/nls/zips/j9zip_zh.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_zh_CN.nls b/runtime/nls/zips/j9zip_zh_CN.nls index 716b652d32f..9db6cf70e81 100644 --- a/runtime/nls/zips/j9zip_zh_CN.nls +++ b/runtime/nls/zips/j9zip_zh_CN.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/nls/zips/j9zip_zh_TW.nls b/runtime/nls/zips/j9zip_zh_TW.nls index 7a9ef048652..d7f39e5756e 100644 --- a/runtime/nls/zips/j9zip_zh_TW.nls +++ b/runtime/nls/zips/j9zip_zh_TW.nls @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Externalised messages for the VM components of the JCL module. diff --git a/runtime/omrsigcompat/module.xml b/runtime/omrsigcompat/module.xml index c2ecfad7bef..165446f3f63 100644 --- a/runtime/omrsigcompat/module.xml +++ b/runtime/omrsigcompat/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/oti/ArrayCopyHelpers.hpp b/runtime/oti/ArrayCopyHelpers.hpp index a1a59ea2cc8..af525eeafe5 100644 --- a/runtime/oti/ArrayCopyHelpers.hpp +++ b/runtime/oti/ArrayCopyHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ARRAYCOPYHELPERS_HPP_) diff --git a/runtime/oti/ContinuationHelpers.hpp b/runtime/oti/ContinuationHelpers.hpp index f74f10e713f..946825138b6 100644 --- a/runtime/oti/ContinuationHelpers.hpp +++ b/runtime/oti/ContinuationHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CONTINUATIONHELPERS_HPP_) #define CONTINUATIONHELPERS_HPP_ diff --git a/runtime/oti/JITInterface.hpp b/runtime/oti/JITInterface.hpp index c38192df8af..d1ea3da6826 100644 --- a/runtime/oti/JITInterface.hpp +++ b/runtime/oti/JITInterface.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(JITINTERFACE_HPP_) diff --git a/runtime/oti/ObjectHash.hpp b/runtime/oti/ObjectHash.hpp index 2386a89499b..7adf74d5408 100644 --- a/runtime/oti/ObjectHash.hpp +++ b/runtime/oti/ObjectHash.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTHASH_HPP_) diff --git a/runtime/oti/ObjectMonitor.hpp b/runtime/oti/ObjectMonitor.hpp index afcdc2ac277..86d49f536b1 100644 --- a/runtime/oti/ObjectMonitor.hpp +++ b/runtime/oti/ObjectMonitor.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OBJECTMONITOR_HPP_) diff --git a/runtime/oti/UnsafeAPI.hpp b/runtime/oti/UnsafeAPI.hpp index 698e4d5a034..fd4638a22e0 100644 --- a/runtime/oti/UnsafeAPI.hpp +++ b/runtime/oti/UnsafeAPI.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(UNSAFEAPI_HPP_) diff --git a/runtime/oti/VMAccess.hpp b/runtime/oti/VMAccess.hpp index fa32264e21f..8559c23eac1 100644 --- a/runtime/oti/VMAccess.hpp +++ b/runtime/oti/VMAccess.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VMACCESS_HPP_) diff --git a/runtime/oti/VMHelpers.hpp b/runtime/oti/VMHelpers.hpp index c42618df1f8..4a7cf8c3c8f 100644 --- a/runtime/oti/VMHelpers.hpp +++ b/runtime/oti/VMHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VMHELPERS_HPP_) diff --git a/runtime/oti/VM_MethodHandleKinds.h b/runtime/oti/VM_MethodHandleKinds.h index af550cac489..65a52b285cc 100644 --- a/runtime/oti/VM_MethodHandleKinds.h +++ b/runtime/oti/VM_MethodHandleKinds.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VM_METHODHANDLEKINDS_H_ diff --git a/runtime/oti/about.html b/runtime/oti/about.html index a9c831b412a..f1b5378d447 100644 --- a/runtime/oti/about.html +++ b/runtime/oti/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/runtime/oti/algorithm_test_api.h b/runtime/oti/algorithm_test_api.h index 8cfda51a168..155be8e9411 100644 --- a/runtime/oti/algorithm_test_api.h +++ b/runtime/oti/algorithm_test_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef algorithm_test_api_h diff --git a/runtime/oti/aotarch.h b/runtime/oti/aotarch.h index cfcfb73b302..425ba1aaf4a 100644 --- a/runtime/oti/aotarch.h +++ b/runtime/oti/aotarch.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef AOTARCH_H diff --git a/runtime/oti/argcount.h b/runtime/oti/argcount.h index b7be69de36a..ca32e1bd81b 100644 --- a/runtime/oti/argcount.h +++ b/runtime/oti/argcount.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef argcount_h diff --git a/runtime/oti/arm64helpers.m4 b/runtime/oti/arm64helpers.m4 index 482e339a1a9..4ecf75cc3e4 100644 --- a/runtime/oti/arm64helpers.m4 +++ b/runtime/oti/arm64helpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/oti/armhelpers.m4 b/runtime/oti/armhelpers.m4 index 69689cbf9c7..fcd130acef6 100644 --- a/runtime/oti/armhelpers.m4 +++ b/runtime/oti/armhelpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/oti/bcnames.h b/runtime/oti/bcnames.h index 6d73a674f3b..2666d516125 100644 --- a/runtime/oti/bcnames.h +++ b/runtime/oti/bcnames.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BCNAMES_H diff --git a/runtime/oti/bcproftest_api.h b/runtime/oti/bcproftest_api.h index eeacaa560ed..3a71478ef27 100644 --- a/runtime/oti/bcproftest_api.h +++ b/runtime/oti/bcproftest_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcproftest_api_h diff --git a/runtime/oti/bcsizes.h b/runtime/oti/bcsizes.h index af3c14567e2..919fca0a782 100644 --- a/runtime/oti/bcsizes.h +++ b/runtime/oti/bcsizes.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef BCSIZES_H diff --git a/runtime/oti/bcutil.h b/runtime/oti/bcutil.h index 95d31a8694d..1ae835c0a88 100644 --- a/runtime/oti/bcutil.h +++ b/runtime/oti/bcutil.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define BCT_ERR_NO_ERROR 0 diff --git a/runtime/oti/bcutil_api.h b/runtime/oti/bcutil_api.h index 46f7ff5cb40..15039882d78 100644 --- a/runtime/oti/bcutil_api.h +++ b/runtime/oti/bcutil_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcutil_api_h diff --git a/runtime/oti/bcverify.h b/runtime/oti/bcverify.h index 8f207c94854..858a6d4325a 100644 --- a/runtime/oti/bcverify.h +++ b/runtime/oti/bcverify.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcverify_h diff --git a/runtime/oti/bcverify_api.h b/runtime/oti/bcverify_api.h index 7f1a0bb6349..6a26768078a 100644 --- a/runtime/oti/bcverify_api.h +++ b/runtime/oti/bcverify_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcverify_api_h diff --git a/runtime/oti/bytecodewalk.h b/runtime/oti/bytecodewalk.h index 586c5ebaec7..aac843d28d7 100644 --- a/runtime/oti/bytecodewalk.h +++ b/runtime/oti/bytecodewalk.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bytecodewalk_h diff --git a/runtime/oti/callconv_api.h b/runtime/oti/callconv_api.h index 5eebf7762ba..e8daa7c22ad 100644 --- a/runtime/oti/callconv_api.h +++ b/runtime/oti/callconv_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef callconv_api_h diff --git a/runtime/oti/cassume_api.h b/runtime/oti/cassume_api.h index c3965d3c594..0e45963dff8 100644 --- a/runtime/oti/cassume_api.h +++ b/runtime/oti/cassume_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef cassume_api_h diff --git a/runtime/oti/cfdumper_api.h b/runtime/oti/cfdumper_api.h index d8cbb801e95..4e715dc04ba 100644 --- a/runtime/oti/cfdumper_api.h +++ b/runtime/oti/cfdumper_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef cfdumper_api_h diff --git a/runtime/oti/cfr.h b/runtime/oti/cfr.h index bdda51d758b..3ada13ad015 100644 --- a/runtime/oti/cfr.h +++ b/runtime/oti/cfr.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CFR_H diff --git a/runtime/oti/cfreader.h b/runtime/oti/cfreader.h index 9153c4bf256..d175ee934e7 100644 --- a/runtime/oti/cfreader.h +++ b/runtime/oti/cfreader.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef cfreader_h diff --git a/runtime/oti/clang_comp.h b/runtime/oti/clang_comp.h index 0ef9b6cc64e..5029eb7d6b8 100644 --- a/runtime/oti/clang_comp.h +++ b/runtime/oti/clang_comp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef clang_comp_h diff --git a/runtime/oti/classloadersearch.h b/runtime/oti/classloadersearch.h index 66dd8ddc483..881232251c4 100644 --- a/runtime/oti/classloadersearch.h +++ b/runtime/oti/classloadersearch.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/oti/dbg.h b/runtime/oti/dbg.h index 8133aed7925..83e9ba75bef 100644 --- a/runtime/oti/dbg.h +++ b/runtime/oti/dbg.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef DBG_H diff --git a/runtime/oti/dbgext_api.h b/runtime/oti/dbgext_api.h index 2a47f6dc676..583261c50d1 100644 --- a/runtime/oti/dbgext_api.h +++ b/runtime/oti/dbgext_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef dbgext_api_h diff --git a/runtime/oti/exe_api.h b/runtime/oti/exe_api.h index c6094117ba9..f6884e65cd2 100644 --- a/runtime/oti/exe_api.h +++ b/runtime/oti/exe_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef exe_api_h diff --git a/runtime/oti/fastJNI.h b/runtime/oti/fastJNI.h index d1686aa48cb..89c3b8722f0 100644 --- a/runtime/oti/fastJNI.h +++ b/runtime/oti/fastJNI.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(FASTJNI_H) diff --git a/runtime/oti/fltdmath.h b/runtime/oti/fltdmath.h index c48e02419e0..dd0f200d218 100644 --- a/runtime/oti/fltdmath.h +++ b/runtime/oti/fltdmath.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/oti/gp.h b/runtime/oti/gp.h index 28b3bbbf6d4..a5feb28ab58 100644 --- a/runtime/oti/gp.h +++ b/runtime/oti/gp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef gp_h diff --git a/runtime/oti/gptest_api.h b/runtime/oti/gptest_api.h index 6f4b07e9966..cb974af49c1 100644 --- a/runtime/oti/gptest_api.h +++ b/runtime/oti/gptest_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef gptest_api_h diff --git a/runtime/oti/helpers.m4 b/runtime/oti/helpers.m4 index 5d29cdc3491..83660d394fc 100644 --- a/runtime/oti/helpers.m4 +++ b/runtime/oti/helpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 divert([-1]) # Prevent `format` macro expanding without arguments diff --git a/runtime/oti/j2sever.h b/runtime/oti/j2sever.h index fde1c589e41..b1fd0606e89 100644 --- a/runtime/oti/j2sever.h +++ b/runtime/oti/j2sever.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j2sever_h #define j2sever_h diff --git a/runtime/oti/j9.h b/runtime/oti/j9.h index 9c592bc65ef..4f4959ce50b 100644 --- a/runtime/oti/j9.h +++ b/runtime/oti/j9.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_H diff --git a/runtime/oti/j9accessbarrier.h b/runtime/oti/j9accessbarrier.h index f8f4b6b46ee..702ccda4a19 100644 --- a/runtime/oti/j9accessbarrier.h +++ b/runtime/oti/j9accessbarrier.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ACCESSBARRIER_H diff --git a/runtime/oti/j9accessbarrierhelpers.h b/runtime/oti/j9accessbarrierhelpers.h index 0b0e741a133..e97a2efbea0 100644 --- a/runtime/oti/j9accessbarrierhelpers.h +++ b/runtime/oti/j9accessbarrierhelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ACCESSBARRIERHELPERS_H diff --git a/runtime/oti/j9arch.h b/runtime/oti/j9arch.h index acbbc30b193..44c1b1b12a6 100644 --- a/runtime/oti/j9arch.h +++ b/runtime/oti/j9arch.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9arch_h diff --git a/runtime/oti/j9argscan.h b/runtime/oti/j9argscan.h index 528ba1f7d14..c68567cf2c4 100644 --- a/runtime/oti/j9argscan.h +++ b/runtime/oti/j9argscan.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9ARGSCAN_H diff --git a/runtime/oti/j9cfg_builder.h b/runtime/oti/j9cfg_builder.h index 7b5c7987693..73e2ceba9a4 100644 --- a/runtime/oti/j9cfg_builder.h +++ b/runtime/oti/j9cfg_builder.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9CFG_BUILDER_H diff --git a/runtime/oti/j9class.h b/runtime/oti/j9class.h index e20989f44ab..f12666e0ad7 100644 --- a/runtime/oti/j9class.h +++ b/runtime/oti/j9class.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9class_h #define j9class_h diff --git a/runtime/oti/j9comp.h b/runtime/oti/j9comp.h index 97847859c84..0eaa1bee3cd 100644 --- a/runtime/oti/j9comp.h +++ b/runtime/oti/j9comp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9comp_h diff --git a/runtime/oti/j9consts.h b/runtime/oti/j9consts.h index 9083dba9459..7f192a102d4 100644 --- a/runtime/oti/j9consts.h +++ b/runtime/oti/j9consts.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9CONSTS_H diff --git a/runtime/oti/j9cp.h b/runtime/oti/j9cp.h index 1839e85bef2..3946e7cad09 100644 --- a/runtime/oti/j9cp.h +++ b/runtime/oti/j9cp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9cp_h diff --git a/runtime/oti/j9dump.h b/runtime/oti/j9dump.h index 5cf5b4997e3..5cefb17cd67 100644 --- a/runtime/oti/j9dump.h +++ b/runtime/oti/j9dump.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9dump_h diff --git a/runtime/oti/j9generated.h b/runtime/oti/j9generated.h index e5fbcf795aa..fc1b25a0ac7 100644 --- a/runtime/oti/j9generated.h +++ b/runtime/oti/j9generated.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9GENERATED_H diff --git a/runtime/oti/j9gs.h b/runtime/oti/j9gs.h index 51c9258a9c7..16bdfbaf394 100644 --- a/runtime/oti/j9gs.h +++ b/runtime/oti/j9gs.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** Masks used for gsParameters->flags */ diff --git a/runtime/oti/j9hookable.h b/runtime/oti/j9hookable.h index 912f350f940..17e81c61ae1 100644 --- a/runtime/oti/j9hookable.h +++ b/runtime/oti/j9hookable.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9HOOKABLE_H_ diff --git a/runtime/oti/j9javaaccessflags.h b/runtime/oti/j9javaaccessflags.h index 9c8b45d78aa..c6668c4cb44 100644 --- a/runtime/oti/j9javaaccessflags.h +++ b/runtime/oti/j9javaaccessflags.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This file contains J9-specific things which have been moved from builder. diff --git a/runtime/oti/j9jit.hdf b/runtime/oti/j9jit.hdf index f45ef166fce..ece31c2d072 100644 --- a/runtime/oti/j9jit.hdf +++ b/runtime/oti/j9jit.hdf @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../oti/jithook.h diff --git a/runtime/oti/j9modifiers_api.h b/runtime/oti/j9modifiers_api.h index b16c64de43d..088291e292c 100644 --- a/runtime/oti/j9modifiers_api.h +++ b/runtime/oti/j9modifiers_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _J9MODIFIERS_API_H diff --git a/runtime/oti/j9nonbuilder.h b/runtime/oti/j9nonbuilder.h index 55e608fcd36..91ea7073f7d 100644 --- a/runtime/oti/j9nonbuilder.h +++ b/runtime/oti/j9nonbuilder.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This file contains J9-specific things which have been moved from builder. diff --git a/runtime/oti/j9port.h b/runtime/oti/j9port.h index 04338f994e1..c70fde36196 100644 --- a/runtime/oti/j9port.h +++ b/runtime/oti/j9port.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OTI_J9PORT_H_) diff --git a/runtime/oti/j9port_generated.h b/runtime/oti/j9port_generated.h index c5916498afa..9a5f5c9c0a1 100644 --- a/runtime/oti/j9port_generated.h +++ b/runtime/oti/j9port_generated.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/oti/j9porterror.h b/runtime/oti/j9porterror.h index 40fdd9e89c5..9eaa8da8daf 100644 --- a/runtime/oti/j9porterror.h +++ b/runtime/oti/j9porterror.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/oti/j9protos.h b/runtime/oti/j9protos.h index 09005004218..c2bf85d3999 100644 --- a/runtime/oti/j9protos.h +++ b/runtime/oti/j9protos.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9PROTOS_H diff --git a/runtime/oti/j9relationship.h b/runtime/oti/j9relationship.h index b6a2112f290..54b0941e42c 100644 --- a/runtime/oti/j9relationship.h +++ b/runtime/oti/j9relationship.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9relationship_h #define j9relationship_h diff --git a/runtime/oti/j9segments.h b/runtime/oti/j9segments.h index 6b274c7240d..8bbbe5fe35e 100644 --- a/runtime/oti/j9segments.h +++ b/runtime/oti/j9segments.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9segments_h diff --git a/runtime/oti/j9simplepool.h b/runtime/oti/j9simplepool.h index 42c7fe71ce7..b231b2fdf0d 100644 --- a/runtime/oti/j9simplepool.h +++ b/runtime/oti/j9simplepool.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9SIMPLEPOOL_H diff --git a/runtime/oti/j9socket.h b/runtime/oti/j9socket.h index ea575496930..839469f611d 100644 --- a/runtime/oti/j9socket.h +++ b/runtime/oti/j9socket.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************\ Portable socket library header. diff --git a/runtime/oti/j9srphashtable.h b/runtime/oti/j9srphashtable.h index 7b14e49067a..d452ac641de 100644 --- a/runtime/oti/j9srphashtable.h +++ b/runtime/oti/j9srphashtable.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9SRPHASHTABLE_H diff --git a/runtime/oti/j9thread.h b/runtime/oti/j9thread.h index 073c4bc2edf..89bd9b0fe03 100644 --- a/runtime/oti/j9thread.h +++ b/runtime/oti/j9thread.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9THREAD_H diff --git a/runtime/oti/j9trace.h b/runtime/oti/j9trace.h index bd915bedefb..03fe720b4a0 100644 --- a/runtime/oti/j9trace.h +++ b/runtime/oti/j9trace.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9trace_h diff --git a/runtime/oti/j9user.h b/runtime/oti/j9user.h index bb4e3bcad7b..0181c57203f 100644 --- a/runtime/oti/j9user.h +++ b/runtime/oti/j9user.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9user_h diff --git a/runtime/oti/j9vm.hdf b/runtime/oti/j9vm.hdf index b4535e59ee9..6baafc4bad5 100644 --- a/runtime/oti/j9vm.hdf +++ b/runtime/oti/j9vm.hdf @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> vmhook.h diff --git a/runtime/oti/jbcmap.h b/runtime/oti/jbcmap.h index 720d3950221..b661b0f5962 100644 --- a/runtime/oti/jbcmap.h +++ b/runtime/oti/jbcmap.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JBCMAP_H diff --git a/runtime/oti/jcl.h b/runtime/oti/jcl.h index 7e857b23f77..ffc5ad92103 100644 --- a/runtime/oti/jcl.h +++ b/runtime/oti/jcl.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jcl_h diff --git a/runtime/oti/jclprots.h b/runtime/oti/jclprots.h index 90ebb2dd751..f39875fe757 100644 --- a/runtime/oti/jclprots.h +++ b/runtime/oti/jclprots.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JCLPROTS_H diff --git a/runtime/oti/jextractnatives_api.h b/runtime/oti/jextractnatives_api.h index c8538431d4b..97b747f2cbd 100644 --- a/runtime/oti/jextractnatives_api.h +++ b/runtime/oti/jextractnatives_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jextractnatives_api_h diff --git a/runtime/oti/jilconsts.h b/runtime/oti/jilconsts.h index 1ab58b283ef..8332e22cf3e 100644 --- a/runtime/oti/jilconsts.h +++ b/runtime/oti/jilconsts.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JILCONSTS_H diff --git a/runtime/oti/jimage.h b/runtime/oti/jimage.h index 40ec795ae53..822e75d25ba 100644 --- a/runtime/oti/jimage.h +++ b/runtime/oti/jimage.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jimage_h diff --git a/runtime/oti/jimagereader.h b/runtime/oti/jimagereader.h index e4d191c9d3f..1256f2e5e57 100644 --- a/runtime/oti/jimagereader.h +++ b/runtime/oti/jimagereader.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jimage_reader_h diff --git a/runtime/oti/jitavl.h b/runtime/oti/jitavl.h index d2cdb727104..da65bb74a91 100644 --- a/runtime/oti/jitavl.h +++ b/runtime/oti/jitavl.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jitavl_h diff --git a/runtime/oti/jitprotos.h b/runtime/oti/jitprotos.h index 86cea59c523..7a3ea20314c 100644 --- a/runtime/oti/jitprotos.h +++ b/runtime/oti/jitprotos.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITPROTOS_H diff --git a/runtime/oti/jitregmap.h b/runtime/oti/jitregmap.h index e773d605f11..d88f302ba96 100644 --- a/runtime/oti/jitregmap.h +++ b/runtime/oti/jitregmap.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JITREGMAP_H diff --git a/runtime/oti/jitserver_api.h b/runtime/oti/jitserver_api.h index 81610350d3e..e109b90fd27 100644 --- a/runtime/oti/jitserver_api.h +++ b/runtime/oti/jitserver_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jitserver_api_h diff --git a/runtime/oti/jitserver_error.h b/runtime/oti/jitserver_error.h index 5ccc5c764cb..0f6646ab90d 100644 --- a/runtime/oti/jitserver_error.h +++ b/runtime/oti/jitserver_error.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jitserver_error_h diff --git a/runtime/oti/jlm.h b/runtime/oti/jlm.h index d13ff5807bd..0e45b966f08 100644 --- a/runtime/oti/jlm.h +++ b/runtime/oti/jlm.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jlm_h diff --git a/runtime/oti/jnichk_api.h b/runtime/oti/jnichk_api.h index ba2e9e5a522..3137194fbd5 100644 --- a/runtime/oti/jnichk_api.h +++ b/runtime/oti/jnichk_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jnichk_api_h diff --git a/runtime/oti/jnicimap.h b/runtime/oti/jnicimap.h index 5f35d15fe5a..e72690bf139 100644 --- a/runtime/oti/jnicimap.h +++ b/runtime/oti/jnicimap.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JNICIMAP_H diff --git a/runtime/oti/jniinv_api.h b/runtime/oti/jniinv_api.h index 2beabe27a2f..f97b4da7a21 100644 --- a/runtime/oti/jniinv_api.h +++ b/runtime/oti/jniinv_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jniinv_api_h diff --git a/runtime/oti/jnitest_api.h b/runtime/oti/jnitest_api.h index d012389d873..bc24df424c7 100644 --- a/runtime/oti/jnitest_api.h +++ b/runtime/oti/jnitest_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jnitest_api_h diff --git a/runtime/oti/jvminit.h b/runtime/oti/jvminit.h index ff798f14547..17fd9fc689b 100644 --- a/runtime/oti/jvminit.h +++ b/runtime/oti/jvminit.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JVMINIT_H diff --git a/runtime/oti/jvmtiInternal.h b/runtime/oti/jvmtiInternal.h index a282516405c..ecbeb914fb0 100644 --- a/runtime/oti/jvmtiInternal.h +++ b/runtime/oti/jvmtiInternal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jvmtiInternal_h diff --git a/runtime/oti/libhlp.h b/runtime/oti/libhlp.h index e8358c6787e..be04ed69c70 100644 --- a/runtime/oti/libhlp.h +++ b/runtime/oti/libhlp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef LIBHLP_H diff --git a/runtime/oti/libjimage.h b/runtime/oti/libjimage.h index 8d36aa6e4aa..571769c2a36 100644 --- a/runtime/oti/libjimage.h +++ b/runtime/oti/libjimage.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef libjimage_h diff --git a/runtime/oti/memcheck.h b/runtime/oti/memcheck.h index c350c83db84..b2455366617 100644 --- a/runtime/oti/memcheck.h +++ b/runtime/oti/memcheck.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef memcheck_h diff --git a/runtime/oti/module.xml b/runtime/oti/module.xml index 31b5c5e4b4a..e3a482496a6 100644 --- a/runtime/oti/module.xml +++ b/runtime/oti/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/oti/monhelp.h b/runtime/oti/monhelp.h index b1526daa7a8..dda4bc08b38 100644 --- a/runtime/oti/monhelp.h +++ b/runtime/oti/monhelp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9_MONHELP_H_ #define J9_MONHELP_H_ diff --git a/runtime/oti/mvmtest_api.h b/runtime/oti/mvmtest_api.h index 560fb1882be..89013f856a9 100644 --- a/runtime/oti/mvmtest_api.h +++ b/runtime/oti/mvmtest_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef mvmtest_api_h diff --git a/runtime/oti/objectreferencesmacros_define.inc b/runtime/oti/objectreferencesmacros_define.inc index a7b4ad74d0f..b8bb420c06b 100644 --- a/runtime/oti/objectreferencesmacros_define.inc +++ b/runtime/oti/objectreferencesmacros_define.inc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(OMR_GC_COMPRESSED_POINTERS) diff --git a/runtime/oti/objectreferencesmacros_undefine.inc b/runtime/oti/objectreferencesmacros_undefine.inc index ccb55ca68a9..325c4dd621c 100644 --- a/runtime/oti/objectreferencesmacros_undefine.inc +++ b/runtime/oti/objectreferencesmacros_undefine.inc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9nonbuilder.h" diff --git a/runtime/oti/objhelp.h b/runtime/oti/objhelp.h index 79b66cafa22..070e87aa9bf 100644 --- a/runtime/oti/objhelp.h +++ b/runtime/oti/objhelp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef objhelp_h diff --git a/runtime/oti/objprof_api.h b/runtime/oti/objprof_api.h index 15b23a66563..196c330eba3 100644 --- a/runtime/oti/objprof_api.h +++ b/runtime/oti/objprof_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef objprof_api_h diff --git a/runtime/oti/pcstack.h b/runtime/oti/pcstack.h index e00f8ba9e93..95a601fe8ef 100644 --- a/runtime/oti/pcstack.h +++ b/runtime/oti/pcstack.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef PCSTACK_H diff --git a/runtime/oti/phelpers.m4 b/runtime/oti/phelpers.m4 index a6e2d5ddc40..6398c84104a 100644 --- a/runtime/oti/phelpers.m4 +++ b/runtime/oti/phelpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/oti/portsock.h b/runtime/oti/portsock.h index d5cf3a7b9d4..ff103cb1dfc 100644 --- a/runtime/oti/portsock.h +++ b/runtime/oti/portsock.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /******************************************************\ Common data types required for using the port socket API diff --git a/runtime/oti/rasdump_api.h b/runtime/oti/rasdump_api.h index df99a086326..dd77453a12f 100644 --- a/runtime/oti/rasdump_api.h +++ b/runtime/oti/rasdump_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef rasdump_api_h diff --git a/runtime/oti/rastrace_api.h b/runtime/oti/rastrace_api.h index 22d9e9fd48d..0ce783ba22c 100644 --- a/runtime/oti/rastrace_api.h +++ b/runtime/oti/rastrace_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef rastrace_api_h diff --git a/runtime/oti/riscvhelpers.m4 b/runtime/oti/riscvhelpers.m4 index bb7e7e5f09c..9663a5e4a6c 100644 --- a/runtime/oti/riscvhelpers.m4 +++ b/runtime/oti/riscvhelpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .cfi_sections .eh_frame, .debug_frame diff --git a/runtime/oti/romclasswalk.h b/runtime/oti/romclasswalk.h index 8d865c3004e..7e7d45b400a 100644 --- a/runtime/oti/romclasswalk.h +++ b/runtime/oti/romclasswalk.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef romclasswalk_h diff --git a/runtime/oti/romcookie.h b/runtime/oti/romcookie.h index 52efd1a30d8..e7680633ba8 100644 --- a/runtime/oti/romcookie.h +++ b/runtime/oti/romcookie.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef ROMCOOKIE_H diff --git a/runtime/oti/rommeth.h b/runtime/oti/rommeth.h index 8e0f47e445f..ea9c5d32771 100644 --- a/runtime/oti/rommeth.h +++ b/runtime/oti/rommeth.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef rommeth_h diff --git a/runtime/oti/segment.h b/runtime/oti/segment.h index b04b655424d..260797085e6 100644 --- a/runtime/oti/segment.h +++ b/runtime/oti/segment.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SEGMENT_H_ diff --git a/runtime/oti/shared_api.h b/runtime/oti/shared_api.h index 94193900bae..b3aedfca5a9 100644 --- a/runtime/oti/shared_api.h +++ b/runtime/oti/shared_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef shared_api_h diff --git a/runtime/oti/shcdatatypes.h b/runtime/oti/shcdatatypes.h index a3bdc32ece2..5732a00f1a4 100644 --- a/runtime/oti/shcdatatypes.h +++ b/runtime/oti/shcdatatypes.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SHCDATATYPES_H_ #define SHCDATATYPES_H_ diff --git a/runtime/oti/shcdatautils.h b/runtime/oti/shcdatautils.h index c9dcc5889db..3b412ad6131 100644 --- a/runtime/oti/shcdatautils.h +++ b/runtime/oti/shcdatautils.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef shcdatautils_h #define shcdatautils_h diff --git a/runtime/oti/shcflags.h b/runtime/oti/shcflags.h index 16221db1567..20f22efa602 100644 --- a/runtime/oti/shcflags.h +++ b/runtime/oti/shcflags.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SHCFLAGS_H diff --git a/runtime/oti/shchelp.h b/runtime/oti/shchelp.h index 6dcfb156c82..647d21e7f21 100644 --- a/runtime/oti/shchelp.h +++ b/runtime/oti/shchelp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SHCHELP_H #define SHCHELP_H diff --git a/runtime/oti/sigquit.h b/runtime/oti/sigquit.h index a5e8925107d..99585d88fb8 100644 --- a/runtime/oti/sigquit.h +++ b/runtime/oti/sigquit.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SIGQUIT_H diff --git a/runtime/oti/simplepool_api.h b/runtime/oti/simplepool_api.h index ecd9975cf95..8fd735671a4 100644 --- a/runtime/oti/simplepool_api.h +++ b/runtime/oti/simplepool_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef simplepool_api_h diff --git a/runtime/oti/srphashtable_api.h b/runtime/oti/srphashtable_api.h index fef15b7d250..04cd38bc4a5 100644 --- a/runtime/oti/srphashtable_api.h +++ b/runtime/oti/srphashtable_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef srphashtable_api_h diff --git a/runtime/oti/stackmap_api.h b/runtime/oti/stackmap_api.h index 6bce40bdb7d..42ae72812ea 100644 --- a/runtime/oti/stackmap_api.h +++ b/runtime/oti/stackmap_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef stackmap_api_h diff --git a/runtime/oti/stackwalk.h b/runtime/oti/stackwalk.h index 5498f2f24d1..9703da7a9b6 100644 --- a/runtime/oti/stackwalk.h +++ b/runtime/oti/stackwalk.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef STACKWALK_H diff --git a/runtime/oti/sunvmi_api.h b/runtime/oti/sunvmi_api.h index be2c5770580..09b543f28a1 100644 --- a/runtime/oti/sunvmi_api.h +++ b/runtime/oti/sunvmi_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/oti/temp.h b/runtime/oti/temp.h index f22134cef07..4b98560c680 100644 --- a/runtime/oti/temp.h +++ b/runtime/oti/temp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef temp_h diff --git a/runtime/oti/util_api.h b/runtime/oti/util_api.h index b3bbc658d1a..73b475bfac3 100644 --- a/runtime/oti/util_api.h +++ b/runtime/oti/util_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef util_api_h diff --git a/runtime/oti/verbose_api.h b/runtime/oti/verbose_api.h index a71dc70a950..9e21844b783 100644 --- a/runtime/oti/verbose_api.h +++ b/runtime/oti/verbose_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef verbose_api_h diff --git a/runtime/oti/verutil_api.h b/runtime/oti/verutil_api.h index 7c495f1d0fe..c4a1353e5b0 100644 --- a/runtime/oti/verutil_api.h +++ b/runtime/oti/verutil_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef verutil_api_h diff --git a/runtime/oti/vm_api.h b/runtime/oti/vm_api.h index c5c6a621dd8..40f69b9de9b 100644 --- a/runtime/oti/vm_api.h +++ b/runtime/oti/vm_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vm_api_h diff --git a/runtime/oti/vmaccess.h b/runtime/oti/vmaccess.h index c74274dcf7c..6ad410f7983 100644 --- a/runtime/oti/vmaccess.h +++ b/runtime/oti/vmaccess.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vmaccess_h diff --git a/runtime/oti/vmargs_api.h b/runtime/oti/vmargs_api.h index 519d03bebbf..4f3efe7cb22 100644 --- a/runtime/oti/vmargs_api.h +++ b/runtime/oti/vmargs_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/oti/vmargs_core_api.h b/runtime/oti/vmargs_core_api.h index cce7699318c..dcbad174c1f 100644 --- a/runtime/oti/vmargs_core_api.h +++ b/runtime/oti/vmargs_core_api.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9nongenerated.h" diff --git a/runtime/oti/vmconstantpool.xml b/runtime/oti/vmconstantpool.xml index a042da92770..825abf041d7 100644 --- a/runtime/oti/vmconstantpool.xml +++ b/runtime/oti/vmconstantpool.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/oti/vrfytbl.h b/runtime/oti/vrfytbl.h index bd83703acf1..af8fee53b9e 100644 --- a/runtime/oti/vrfytbl.h +++ b/runtime/oti/vrfytbl.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef VRFYTBL_H diff --git a/runtime/oti/xhelpers.m4 b/runtime/oti/xhelpers.m4 index c66d27bc2b8..9d9fe46aba2 100644 --- a/runtime/oti/xhelpers.m4 +++ b/runtime/oti/xhelpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/oti/zhelpers.m4 b/runtime/oti/zhelpers.m4 index 7f897a3a4e8..60a3ef841f8 100644 --- a/runtime/oti/zhelpers.m4 +++ b/runtime/oti/zhelpers.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/oti/zipCachePool.hdf b/runtime/oti/zipCachePool.hdf index 4b039c56705..d2ca968642f 100644 --- a/runtime/oti/zipCachePool.hdf +++ b/runtime/oti/zipCachePool.hdf @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> vmzipcachehook.h diff --git a/runtime/port/CMakeLists.txt b/runtime/port/CMakeLists.txt index d4d3185da49..89a61c8b9b3 100644 --- a/runtime/port/CMakeLists.txt +++ b/runtime/port/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Note: The structure of this file is a bit weird. diff --git a/runtime/port/aix/j9hypervisor.c b/runtime/port/aix/j9hypervisor.c index 15da56de1c8..d9968bc733c 100644 --- a/runtime/port/aix/j9hypervisor.c +++ b/runtime/port/aix/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/aix/j9ri.c b/runtime/port/aix/j9ri.c index df7c1460c0b..0029dfe22b3 100644 --- a/runtime/port/aix/j9ri.c +++ b/runtime/port/aix/j9ri.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9gp.c b/runtime/port/common/j9gp.c index 3bfc68fe471..8ae6b6b8a19 100644 --- a/runtime/port/common/j9gp.c +++ b/runtime/port/common/j9gp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9gp.h b/runtime/port/common/j9gp.h index dde1c0a269e..4f62a66c22c 100644 --- a/runtime/port/common/j9gp.h +++ b/runtime/port/common/j9gp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9gp_h #define j9gp_h diff --git a/runtime/port/common/j9gs.c b/runtime/port/common/j9gs.c index b078fa0fbd0..1dabc699d0a 100644 --- a/runtime/port/common/j9gs.c +++ b/runtime/port/common/j9gs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor.c b/runtime/port/common/j9hypervisor.c index 1b38d1f54b7..dfd18e9240f 100644 --- a/runtime/port/common/j9hypervisor.c +++ b/runtime/port/common/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor.h b/runtime/port/common/j9hypervisor.h index 4e7c86a9ad7..b908f349c76 100644 --- a/runtime/port/common/j9hypervisor.h +++ b/runtime/port/common/j9hypervisor.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor_common.c b/runtime/port/common/j9hypervisor_common.c index 10b75d1ce43..7143ed64eff 100644 --- a/runtime/port/common/j9hypervisor_common.c +++ b/runtime/port/common/j9hypervisor_common.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor_common.h b/runtime/port/common/j9hypervisor_common.h index f4588e79ddd..5566753541c 100644 --- a/runtime/port/common/j9hypervisor_common.h +++ b/runtime/port/common/j9hypervisor_common.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor_i386.c b/runtime/port/common/j9hypervisor_i386.c index 441632030f7..9baf909e57e 100644 --- a/runtime/port/common/j9hypervisor_i386.c +++ b/runtime/port/common/j9hypervisor_i386.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor_i386.h b/runtime/port/common/j9hypervisor_i386.h index bd666c12b88..a17aae2256a 100644 --- a/runtime/port/common/j9hypervisor_i386.h +++ b/runtime/port/common/j9hypervisor_i386.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9hypervisor_vmware.h b/runtime/port/common/j9hypervisor_vmware.h index c4487553498..e9079213166 100644 --- a/runtime/port/common/j9hypervisor_vmware.h +++ b/runtime/port/common/j9hypervisor_vmware.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9ipcmutex.c b/runtime/port/common/j9ipcmutex.c index 551dfee0005..e58bf7bd3ca 100644 --- a/runtime/port/common/j9ipcmutex.c +++ b/runtime/port/common/j9ipcmutex.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9mem_basic.c b/runtime/port/common/j9mem_basic.c index aa02b48d1b6..0ddc5fd30b0 100644 --- a/runtime/port/common/j9mem_basic.c +++ b/runtime/port/common/j9mem_basic.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/port/common/j9port.c b/runtime/port/common/j9port.c index c89a996e956..0254562a133 100644 --- a/runtime/port/common/j9port.c +++ b/runtime/port/common/j9port.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9portcontrol.c b/runtime/port/common/j9portcontrol.c index 16b74f9aad6..c97b01e5d2b 100644 --- a/runtime/port/common/j9portcontrol.c +++ b/runtime/port/common/j9portcontrol.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/port/common/j9process.c b/runtime/port/common/j9process.c index 6af1ba13391..6c62277ac28 100644 --- a/runtime/port/common/j9process.c +++ b/runtime/port/common/j9process.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9prt.tdf b/runtime/port/common/j9prt.tdf index f495ea7fc4f..cf2f2ca762c 100644 --- a/runtime/port/common/j9prt.tdf +++ b/runtime/port/common/j9prt.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9prt diff --git a/runtime/port/common/j9ri.c b/runtime/port/common/j9ri.c index fc2fbcd0108..4f2c3d3955d 100644 --- a/runtime/port/common/j9ri.c +++ b/runtime/port/common/j9ri.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9ri.h b/runtime/port/common/j9ri.h index 45dcbe422e5..5947d6ce245 100644 --- a/runtime/port/common/j9ri.h +++ b/runtime/port/common/j9ri.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #define J9PORT_RI_ENABLED ((uint32_t) 0x1) diff --git a/runtime/port/common/j9shmem.c b/runtime/port/common/j9shmem.c index c09ae6c1e70..520887d7d49 100644 --- a/runtime/port/common/j9shmem.c +++ b/runtime/port/common/j9shmem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9shsem.c b/runtime/port/common/j9shsem.c index 2f13e4fa2aa..63681c12f2a 100644 --- a/runtime/port/common/j9shsem.c +++ b/runtime/port/common/j9shsem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9shsem.h b/runtime/port/common/j9shsem.h index 0e60680b56a..0e6714cd1c6 100644 --- a/runtime/port/common/j9shsem.h +++ b/runtime/port/common/j9shsem.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9shsem_h #define j9shsem_h diff --git a/runtime/port/common/j9shsem_deprecated.c b/runtime/port/common/j9shsem_deprecated.c index ba04b62cdac..a96597a0af4 100644 --- a/runtime/port/common/j9shsem_deprecated.c +++ b/runtime/port/common/j9shsem_deprecated.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9sock.c b/runtime/port/common/j9sock.c index 943f51cef10..a1cd3da890e 100644 --- a/runtime/port/common/j9sock.c +++ b/runtime/port/common/j9sock.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9sockptb.c b/runtime/port/common/j9sockptb.c index 17d1a288cc8..7b93098e6e4 100644 --- a/runtime/port/common/j9sockptb.c +++ b/runtime/port/common/j9sockptb.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9sysinfo.c b/runtime/port/common/j9sysinfo.c index 9da91bdc55a..8475d0da57b 100644 --- a/runtime/port/common/j9sysinfo.c +++ b/runtime/port/common/j9sysinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9sysinfo_helpers.c b/runtime/port/common/j9sysinfo_helpers.c index 5996af28624..e685b3f6dff 100644 --- a/runtime/port/common/j9sysinfo_helpers.c +++ b/runtime/port/common/j9sysinfo_helpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/j9sysinfo_helpers.h b/runtime/port/common/j9sysinfo_helpers.h index bd8e82206d0..d754a9b52fb 100644 --- a/runtime/port/common/j9sysinfo_helpers.h +++ b/runtime/port/common/j9sysinfo_helpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/common/module.xml b/runtime/port/common/module.xml index 9de824ec337..5e5e9440d43 100644 --- a/runtime/port/common/module.xml +++ b/runtime/port/common/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/port/include/j9portpg.h b/runtime/port/include/j9portpg.h index 27642a6b79d..e702072ffae 100644 --- a/runtime/port/include/j9portpg.h +++ b/runtime/port/include/j9portpg.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9portpg_h #define j9portpg_h diff --git a/runtime/port/j9omrport/j9omrport.mk.ftl b/runtime/port/j9omrport/j9omrport.mk.ftl index 26cc4a3ffe8..8923a8f5248 100644 --- a/runtime/port/j9omrport/j9omrport.mk.ftl +++ b/runtime/port/j9omrport/j9omrport.mk.ftl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################### # This makefile is generated using an UMA template. diff --git a/runtime/port/j9omrport/module.xml b/runtime/port/j9omrport/module.xml index 954513e8bda..b61a835ccc7 100644 --- a/runtime/port/j9omrport/module.xml +++ b/runtime/port/j9omrport/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/port/linux/j9hypervisor.c b/runtime/port/linux/j9hypervisor.c index 247284311f3..9aacc7c7fce 100644 --- a/runtime/port/linux/j9hypervisor.c +++ b/runtime/port/linux/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxamd64/j9ri.c b/runtime/port/linuxamd64/j9ri.c index b43831c354f..07eefcaebc3 100644 --- a/runtime/port/linuxamd64/j9ri.c +++ b/runtime/port/linuxamd64/j9ri.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/port/linuxppc/j9hypervisor.c b/runtime/port/linuxppc/j9hypervisor.c index 8713f0aaf45..5e1e72f2cbe 100644 --- a/runtime/port/linuxppc/j9hypervisor.c +++ b/runtime/port/linuxppc/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxppc/j9ri.c b/runtime/port/linuxppc/j9ri.c index 45210e6891f..a400ae0ef6d 100644 --- a/runtime/port/linuxppc/j9ri.c +++ b/runtime/port/linuxppc/j9ri.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxs390/j9gs.c b/runtime/port/linuxs390/j9gs.c index 9d16d08359a..6ceb8cd51c7 100644 --- a/runtime/port/linuxs390/j9gs.c +++ b/runtime/port/linuxs390/j9gs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxs390/j9hypervisor.c b/runtime/port/linuxs390/j9hypervisor.c index d9a8d208328..e93eedbb141 100644 --- a/runtime/port/linuxs390/j9hypervisor.c +++ b/runtime/port/linuxs390/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxs390/j9hypervisor_systemz.c b/runtime/port/linuxs390/j9hypervisor_systemz.c index 134ff970e0e..18445f1df5b 100644 --- a/runtime/port/linuxs390/j9hypervisor_systemz.c +++ b/runtime/port/linuxs390/j9hypervisor_systemz.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxs390/j9hypervisor_systemz.h b/runtime/port/linuxs390/j9hypervisor_systemz.h index 73169aa2f3f..b13c9b51412 100644 --- a/runtime/port/linuxs390/j9hypervisor_systemz.h +++ b/runtime/port/linuxs390/j9hypervisor_systemz.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxs390/j9ri.c b/runtime/port/linuxs390/j9ri.c index d7df60da5f7..7788a074b5d 100644 --- a/runtime/port/linuxs390/j9ri.c +++ b/runtime/port/linuxs390/j9ri.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/linuxs390/j9sysinfo_helpers.h b/runtime/port/linuxs390/j9sysinfo_helpers.h index 42799758657..04f6c19a81d 100644 --- a/runtime/port/linuxs390/j9sysinfo_helpers.h +++ b/runtime/port/linuxs390/j9sysinfo_helpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/module.xml b/runtime/port/module.xml index bf342a8d1ae..341c7b967ad 100644 --- a/runtime/port/module.xml +++ b/runtime/port/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/port/portpriv.h b/runtime/port/portpriv.h index bb3de443ac8..04aae78c4ae 100644 --- a/runtime/port/portpriv.h +++ b/runtime/port/portpriv.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef portlibraryprivatedefines_h diff --git a/runtime/port/ri_support_default.xml b/runtime/port/ri_support_default.xml index c9937b60609..fe7eab04639 100644 --- a/runtime/port/ri_support_default.xml +++ b/runtime/port/ri_support_default.xml @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/runtime/port/sysvipc/j9SysvIPCWrappers.c b/runtime/port/sysvipc/j9SysvIPCWrappers.c index 86dea6db4fd..b1a9c217d66 100644 --- a/runtime/port/sysvipc/j9SysvIPCWrappers.c +++ b/runtime/port/sysvipc/j9SysvIPCWrappers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9SysvIPCWrappers.h" diff --git a/runtime/port/sysvipc/j9SysvIPCWrappers.h b/runtime/port/sysvipc/j9SysvIPCWrappers.h index 2fcad9bd4ad..e8e0b5f37a1 100644 --- a/runtime/port/sysvipc/j9SysvIPCWrappers.h +++ b/runtime/port/sysvipc/j9SysvIPCWrappers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9_sysv_wrappers_h #define j9_sysv_wrappers_h diff --git a/runtime/port/sysvipc/j9sharedhelper.c b/runtime/port/sysvipc/j9sharedhelper.c index 903e050ab7c..685c9fb2798 100644 --- a/runtime/port/sysvipc/j9sharedhelper.c +++ b/runtime/port/sysvipc/j9sharedhelper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9sharedhelper.h" diff --git a/runtime/port/sysvipc/j9sharedhelper.h b/runtime/port/sysvipc/j9sharedhelper.h index e05137678e4..81aa0282f44 100644 --- a/runtime/port/sysvipc/j9sharedhelper.h +++ b/runtime/port/sysvipc/j9sharedhelper.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9sharedhelper_h #define j9sharedhelper_h diff --git a/runtime/port/sysvipc/j9shmem.c b/runtime/port/sysvipc/j9shmem.c index 07f2010620f..ef8a3ba8944 100644 --- a/runtime/port/sysvipc/j9shmem.c +++ b/runtime/port/sysvipc/j9shmem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/sysvipc/j9shmem.h b/runtime/port/sysvipc/j9shmem.h index e8eaad77caf..c94696d7d99 100644 --- a/runtime/port/sysvipc/j9shmem.h +++ b/runtime/port/sysvipc/j9shmem.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9shmem_h diff --git a/runtime/port/sysvipc/j9shsem.c b/runtime/port/sysvipc/j9shsem.c index 15d8dc12bf1..2e8322e2a6e 100644 --- a/runtime/port/sysvipc/j9shsem.c +++ b/runtime/port/sysvipc/j9shsem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/sysvipc/j9shsem.h b/runtime/port/sysvipc/j9shsem.h index 2b99e480648..88b319a7629 100644 --- a/runtime/port/sysvipc/j9shsem.h +++ b/runtime/port/sysvipc/j9shsem.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9shsem_h #define j9shsem_h diff --git a/runtime/port/sysvipc/j9shsem_deprecated.c b/runtime/port/sysvipc/j9shsem_deprecated.c index 5eeb255877c..808f356a953 100644 --- a/runtime/port/sysvipc/j9shsem_deprecated.c +++ b/runtime/port/sysvipc/j9shsem_deprecated.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/sysvipc/j9shsemun.h b/runtime/port/sysvipc/j9shsemun.h index 964dcc4bf26..f274e45f626 100644 --- a/runtime/port/sysvipc/j9shsemun.h +++ b/runtime/port/sysvipc/j9shsemun.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9shsemun_h #define j9shsemun_h diff --git a/runtime/port/unix/j9gs_s390.c b/runtime/port/unix/j9gs_s390.c index 771d01a40e8..a5429f2cda6 100644 --- a/runtime/port/unix/j9gs_s390.c +++ b/runtime/port/unix/j9gs_s390.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix/j9hypervisor_systemp.c b/runtime/port/unix/j9hypervisor_systemp.c index d3852e32410..d789a32437e 100644 --- a/runtime/port/unix/j9hypervisor_systemp.c +++ b/runtime/port/unix/j9hypervisor_systemp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix/j9hypervisor_systemp.h b/runtime/port/unix/j9hypervisor_systemp.h index b5035dd432d..b812eaea219 100644 --- a/runtime/port/unix/j9hypervisor_systemp.h +++ b/runtime/port/unix/j9hypervisor_systemp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix/j9ipcmutex.c b/runtime/port/unix/j9ipcmutex.c index 466c88554bf..b0a2c972c26 100644 --- a/runtime/port/unix/j9ipcmutex.c +++ b/runtime/port/unix/j9ipcmutex.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix/j9process.c b/runtime/port/unix/j9process.c index f6c1a018b03..42d833f8fa5 100644 --- a/runtime/port/unix/j9process.c +++ b/runtime/port/unix/j9process.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix/j9sock.c b/runtime/port/unix/j9sock.c index e3766ccb8bd..b128503d04e 100644 --- a/runtime/port/unix/j9sock.c +++ b/runtime/port/unix/j9sock.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix/j9sysinfo.c b/runtime/port/unix/j9sysinfo.c index 3301ef3b3bf..1bbb7b673bd 100644 --- a/runtime/port/unix/j9sysinfo.c +++ b/runtime/port/unix/j9sysinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/unix_include/j9portpg.h b/runtime/port/unix_include/j9portpg.h index c4672a61403..7f3402ff835 100644 --- a/runtime/port/unix_include/j9portpg.h +++ b/runtime/port/unix_include/j9portpg.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9portpg_h #define j9portpg_h diff --git a/runtime/port/unix_include/j9sock.h b/runtime/port/unix_include/j9sock.h index 7b24baa204b..51761cd532a 100644 --- a/runtime/port/unix_include/j9sock.h +++ b/runtime/port/unix_include/j9sock.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9sock_h diff --git a/runtime/port/vendor_port_default.xml b/runtime/port/vendor_port_default.xml index 7647ed1b571..a60a1334298 100644 --- a/runtime/port/vendor_port_default.xml +++ b/runtime/port/vendor_port_default.xml @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/runtime/port/win32/j9hypervisor.c b/runtime/port/win32/j9hypervisor.c index 117610058fb..6ed81e000e7 100644 --- a/runtime/port/win32/j9hypervisor.c +++ b/runtime/port/win32/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9ipcmutex.c b/runtime/port/win32/j9ipcmutex.c index 271d6be77e3..f256e5ed3a2 100644 --- a/runtime/port/win32/j9ipcmutex.c +++ b/runtime/port/win32/j9ipcmutex.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9mem_basic.c b/runtime/port/win32/j9mem_basic.c index f819a61152a..617c3066b33 100644 --- a/runtime/port/win32/j9mem_basic.c +++ b/runtime/port/win32/j9mem_basic.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/port/win32/j9process.c b/runtime/port/win32/j9process.c index 425dc737a24..501cfc7fb3a 100644 --- a/runtime/port/win32/j9process.c +++ b/runtime/port/win32/j9process.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9shmem.c b/runtime/port/win32/j9shmem.c index dc600d0c32b..0f83c9ffec9 100644 --- a/runtime/port/win32/j9shmem.c +++ b/runtime/port/win32/j9shmem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9shsem.c b/runtime/port/win32/j9shsem.c index 5aaa59c096f..490ee67efd4 100644 --- a/runtime/port/win32/j9shsem.c +++ b/runtime/port/win32/j9shsem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9shsem_deprecated.c b/runtime/port/win32/j9shsem_deprecated.c index 8f565071fa0..3e9eae7d9e5 100644 --- a/runtime/port/win32/j9shsem_deprecated.c +++ b/runtime/port/win32/j9shsem_deprecated.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9sock.c b/runtime/port/win32/j9sock.c index b26f677f746..ed63a83c553 100644 --- a/runtime/port/win32/j9sock.c +++ b/runtime/port/win32/j9sock.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32/j9sysinfo.c b/runtime/port/win32/j9sysinfo.c index 080a9dfe84f..350c6a8ba20 100644 --- a/runtime/port/win32/j9sysinfo.c +++ b/runtime/port/win32/j9sysinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/win32_include/j9portpg.h b/runtime/port/win32_include/j9portpg.h index 1314414b0ea..2836bffc2b0 100644 --- a/runtime/port/win32_include/j9portpg.h +++ b/runtime/port/win32_include/j9portpg.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9portpg_h #define j9portpg_h diff --git a/runtime/port/win32_include/j9shmem.h b/runtime/port/win32_include/j9shmem.h index 39e568ed61e..1453dcb1a30 100644 --- a/runtime/port/win32_include/j9shmem.h +++ b/runtime/port/win32_include/j9shmem.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9shmem_h #define j9shmem_h diff --git a/runtime/port/win32_include/j9shsem.h b/runtime/port/win32_include/j9shsem.h index f62629b4ad4..7abd5e6d438 100644 --- a/runtime/port/win32_include/j9shsem.h +++ b/runtime/port/win32_include/j9shsem.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9shsem_h #define j9shsem_h diff --git a/runtime/port/win32_include/j9sock.h b/runtime/port/win32_include/j9sock.h index 451d789ff7c..3050f8ad8a7 100644 --- a/runtime/port/win32_include/j9sock.h +++ b/runtime/port/win32_include/j9sock.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9sock_h diff --git a/runtime/port/zos390/j9csrsi.c b/runtime/port/zos390/j9csrsi.c index 31156a19e82..03550c98175 100644 --- a/runtime/port/zos390/j9csrsi.c +++ b/runtime/port/zos390/j9csrsi.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/port/zos390/j9csrsi.h b/runtime/port/zos390/j9csrsi.h index a8bf67a2f38..21aec750744 100644 --- a/runtime/port/zos390/j9csrsi.h +++ b/runtime/port/zos390/j9csrsi.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9CSRSI_H_ #define J9CSRSI_H_ diff --git a/runtime/port/zos390/j9csrsi_wrp.s b/runtime/port/zos390/j9csrsi_wrp.s index f5d2b291970..a4bfa3fa6e6 100644 --- a/runtime/port/zos390/j9csrsi_wrp.s +++ b/runtime/port/zos390/j9csrsi_wrp.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TITLE 'j9csrsi_wrp.s' diff --git a/runtime/port/zos390/j9gs.c b/runtime/port/zos390/j9gs.c index d3d43e66dd5..ec9f8027bd1 100644 --- a/runtime/port/zos390/j9gs.c +++ b/runtime/port/zos390/j9gs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/zos390/j9gs_get_supported.s b/runtime/port/zos390/j9gs_get_supported.s index 7c76304e088..f0dd9d0e22e 100644 --- a/runtime/port/zos390/j9gs_get_supported.s +++ b/runtime/port/zos390/j9gs_get_supported.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TITLE 'Get_Guarded Storage_Supported' ********************************************************************** diff --git a/runtime/port/zos390/j9gs_load_gscb.s b/runtime/port/zos390/j9gs_load_gscb.s index 4fd9810a492..acee5bbb7b2 100644 --- a/runtime/port/zos390/j9gs_load_gscb.s +++ b/runtime/port/zos390/j9gs_load_gscb.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 * TITLE 'j9gs_load_gcb' ********************************************************************** diff --git a/runtime/port/zos390/j9gs_store_gscb.s b/runtime/port/zos390/j9gs_store_gscb.s index 437420d8fd0..ee9d751b7ad 100644 --- a/runtime/port/zos390/j9gs_store_gscb.s +++ b/runtime/port/zos390/j9gs_store_gscb.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 * TITLE 'j9gs_store_gcb' ********************************************************************** diff --git a/runtime/port/zos390/j9guardedstorage.mc b/runtime/port/zos390/j9guardedstorage.mc index 9414b3b7819..2a83718660a 100644 --- a/runtime/port/zos390/j9guardedstorage.mc +++ b/runtime/port/zos390/j9guardedstorage.mc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * This file is used to generate the HLASM corresponding to the C calls diff --git a/runtime/port/zos390/j9hypervisor.c b/runtime/port/zos390/j9hypervisor.c index 41d50c717f8..0026cebd7fc 100644 --- a/runtime/port/zos390/j9hypervisor.c +++ b/runtime/port/zos390/j9hypervisor.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/zos390/j9hypervisor_systemz.c b/runtime/port/zos390/j9hypervisor_systemz.c index d9e2347006d..fa57d175baf 100644 --- a/runtime/port/zos390/j9hypervisor_systemz.c +++ b/runtime/port/zos390/j9hypervisor_systemz.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/zos390/j9mprotect.s b/runtime/port/zos390/j9mprotect.s index a3b0ebd617f..08d75ea7093 100644 --- a/runtime/port/zos390/j9mprotect.s +++ b/runtime/port/zos390/j9mprotect.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *********************************************************************** TITLE 'j9mprotect.s' diff --git a/runtime/port/zos390/j9munprotect.s b/runtime/port/zos390/j9munprotect.s index 1402d6f9117..052eda1f112 100644 --- a/runtime/port/zos390/j9munprotect.s +++ b/runtime/port/zos390/j9munprotect.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *********************************************************************** TITLE 'j9munprotect.s' diff --git a/runtime/port/zos390/j9portpg.h b/runtime/port/zos390/j9portpg.h index 09c7e6d69ec..1d4c12dd8a8 100644 --- a/runtime/port/zos390/j9portpg.h +++ b/runtime/port/zos390/j9portpg.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef j9portpg_h #define j9portpg_h diff --git a/runtime/port/zos390/j9sysinfo_helpers.c b/runtime/port/zos390/j9sysinfo_helpers.c index ea032d72c8c..ac0b52626a4 100644 --- a/runtime/port/zos390/j9sysinfo_helpers.c +++ b/runtime/port/zos390/j9sysinfo_helpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/port/zos390/j9sysinfo_helpers.h b/runtime/port/zos390/j9sysinfo_helpers.h index c525c1db02f..5357676ef9f 100644 --- a/runtime/port/zos390/j9sysinfo_helpers.h +++ b/runtime/port/zos390/j9sysinfo_helpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SYSINFO_HELPERS_H_ diff --git a/runtime/port/zos390/protect_helpers.c b/runtime/port/zos390/protect_helpers.c index f0f33377741..01e4e4ea0ae 100644 --- a/runtime/port/zos390/protect_helpers.c +++ b/runtime/port/zos390/protect_helpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/port/zos390/protect_helpers.h b/runtime/port/zos390/protect_helpers.h index e0bce875fa3..154b3d7c44d 100644 --- a/runtime/port/zos390/protect_helpers.h +++ b/runtime/port/zos390/protect_helpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(PROTECT_HELPERS_H) diff --git a/runtime/rasdump/CMakeLists.txt b/runtime/rasdump/CMakeLists.txt index 73fcdcb2844..9efeebad343 100644 --- a/runtime/rasdump/CMakeLists.txt +++ b/runtime/rasdump/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_tracegen(j9dmp.tdf) diff --git a/runtime/rasdump/FileStream.cpp b/runtime/rasdump/FileStream.cpp index 4f1cd4bdac5..502659717b0 100644 --- a/runtime/rasdump/FileStream.cpp +++ b/runtime/rasdump/FileStream.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Includes */ diff --git a/runtime/rasdump/FileStream.hpp b/runtime/rasdump/FileStream.hpp index 0c85e1368b9..8a0cd74e669 100644 --- a/runtime/rasdump/FileStream.hpp +++ b/runtime/rasdump/FileStream.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef FILESTREAM_HPP #define FILESTREAM_HPP diff --git a/runtime/rasdump/TextFileStream.cpp b/runtime/rasdump/TextFileStream.cpp index ad0fa1a25a3..b674e530591 100644 --- a/runtime/rasdump/TextFileStream.cpp +++ b/runtime/rasdump/TextFileStream.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Includes */ diff --git a/runtime/rasdump/TextFileStream.hpp b/runtime/rasdump/TextFileStream.hpp index 11d934260cf..9b64850b814 100644 --- a/runtime/rasdump/TextFileStream.hpp +++ b/runtime/rasdump/TextFileStream.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEXTFILESTREAM_HPP #define TEXTFILESTREAM_HPP diff --git a/runtime/rasdump/dmpagent.c b/runtime/rasdump/dmpagent.c index b8322a00839..1dc5be80836 100644 --- a/runtime/rasdump/dmpagent.c +++ b/runtime/rasdump/dmpagent.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/rasdump/dmpmap.c b/runtime/rasdump/dmpmap.c index 4d664ea6677..c6840f5a550 100644 --- a/runtime/rasdump/dmpmap.c +++ b/runtime/rasdump/dmpmap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/rasdump/dmpqueue.c b/runtime/rasdump/dmpqueue.c index a3b63327e6e..b578ad46cc7 100644 --- a/runtime/rasdump/dmpqueue.c +++ b/runtime/rasdump/dmpqueue.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "rasdump_internal.h" diff --git a/runtime/rasdump/dmpsup.c b/runtime/rasdump/dmpsup.c index 18ad8a0426c..bd8c5a1d48c 100644 --- a/runtime/rasdump/dmpsup.c +++ b/runtime/rasdump/dmpsup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "dmpsup.h" diff --git a/runtime/rasdump/dmpsup.h b/runtime/rasdump/dmpsup.h index 256bb6f8ba7..fc5a999694d 100644 --- a/runtime/rasdump/dmpsup.h +++ b/runtime/rasdump/dmpsup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef dmpsup_h diff --git a/runtime/rasdump/heapdump.cpp b/runtime/rasdump/heapdump.cpp index f1493824ec7..a463ad8f4a9 100644 --- a/runtime/rasdump/heapdump.cpp +++ b/runtime/rasdump/heapdump.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Includes */ diff --git a/runtime/rasdump/heapdump_classic.c b/runtime/rasdump/heapdump_classic.c index f592a5007af..1754e355b00 100644 --- a/runtime/rasdump/heapdump_classic.c +++ b/runtime/rasdump/heapdump_classic.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "dmpsup.h" diff --git a/runtime/rasdump/j9dmp.tdf b/runtime/rasdump/j9dmp.tdf index 48292e9f75f..a84fae43909 100644 --- a/runtime/rasdump/j9dmp.tdf +++ b/runtime/rasdump/j9dmp.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9dmp diff --git a/runtime/rasdump/javadump.cpp b/runtime/rasdump/javadump.cpp index 18001e00741..71fe1e70fa0 100644 --- a/runtime/rasdump/javadump.cpp +++ b/runtime/rasdump/javadump.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Includes */ diff --git a/runtime/rasdump/jobname.s b/runtime/rasdump/jobname.s index 8bf809849e3..7b1df3c6d20 100644 --- a/runtime/rasdump/jobname.s +++ b/runtime/rasdump/jobname.s @@ -19,8 +19,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 * TITLE 'jobname.s' * diff --git a/runtime/rasdump/module.xml b/runtime/rasdump/module.xml index d059688a6b7..d054f966bcc 100644 --- a/runtime/rasdump/module.xml +++ b/runtime/rasdump/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/rasdump/rasdump_internal.h b/runtime/rasdump/rasdump_internal.h index 1d12f6f1115..a39257a4873 100644 --- a/runtime/rasdump/rasdump_internal.h +++ b/runtime/rasdump/rasdump_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef rasdump_internal_h diff --git a/runtime/rasdump/trigger.c b/runtime/rasdump/trigger.c index cd6902dc990..91917cbf4d0 100644 --- a/runtime/rasdump/trigger.c +++ b/runtime/rasdump/trigger.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/rastrace/CMakeLists.txt b/runtime/rastrace/CMakeLists.txt index aa5114b9b67..0d874ac9400 100644 --- a/runtime/rastrace/CMakeLists.txt +++ b/runtime/rastrace/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_tracegen(dg.tdf) diff --git a/runtime/rastrace/dg.tdf b/runtime/rastrace/dg.tdf index f0be59a5c38..8eb434bba59 100644 --- a/runtime/rastrace/dg.tdf +++ b/runtime/rastrace/dg.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** // Trace definition file for the intrinsic tracepoints issued by the trace engine. diff --git a/runtime/rastrace/j9rastrace.h b/runtime/rastrace/j9rastrace.h index 9332f45c711..d754ec60f0d 100644 --- a/runtime/rastrace/j9rastrace.h +++ b/runtime/rastrace/j9rastrace.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9RASTRACE_H diff --git a/runtime/rastrace/j9trc.tdf b/runtime/rastrace/j9trc.tdf index 454612d2e78..48e03741d06 100644 --- a/runtime/rastrace/j9trc.tdf +++ b/runtime/rastrace/j9trc.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9trc diff --git a/runtime/rastrace/j9trc_aux.tdf b/runtime/rastrace/j9trc_aux.tdf index f43dac9abbf..cf3eafbc5f6 100644 --- a/runtime/rastrace/j9trc_aux.tdf +++ b/runtime/rastrace/j9trc_aux.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9trc_aux diff --git a/runtime/rastrace/method_trace.c b/runtime/rastrace/method_trace.c index 41b175fefcd..9982d27c5c9 100644 --- a/runtime/rastrace/method_trace.c +++ b/runtime/rastrace/method_trace.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "rommeth.h" diff --git a/runtime/rastrace/method_trigger.c b/runtime/rastrace/method_trigger.c index e97169a4642..cccaddde31f 100644 --- a/runtime/rastrace/method_trigger.c +++ b/runtime/rastrace/method_trigger.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* _GNU_SOURCE forces GLIBC_2.0 sscanf/vsscanf/fscanf for RHEL5 compatibility */ diff --git a/runtime/rastrace/module.xml b/runtime/rastrace/module.xml index 6bda2c7c526..133c738d5cd 100644 --- a/runtime/rastrace/module.xml +++ b/runtime/rastrace/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/rastrace/mt.tdf b/runtime/rastrace/mt.tdf index ccd10a42354..4a5ce1bc02e 100644 --- a/runtime/rastrace/mt.tdf +++ b/runtime/rastrace/mt.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=mt diff --git a/runtime/rastrace/rastrace_internal.h b/runtime/rastrace/rastrace_internal.h index b61b235c3e6..59a1d0292e1 100644 --- a/runtime/rastrace/rastrace_internal.h +++ b/runtime/rastrace/rastrace_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RASTRACE_INTERNAL_H diff --git a/runtime/rastrace/traceformat.h b/runtime/rastrace/traceformat.h index 5b3013e0f81..8919574fdc6 100644 --- a/runtime/rastrace/traceformat.h +++ b/runtime/rastrace/traceformat.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRACEFORMAT_H_ diff --git a/runtime/rastrace/trccomponent.c b/runtime/rastrace/trccomponent.c index e7609701544..3300cf75116 100644 --- a/runtime/rastrace/trccomponent.c +++ b/runtime/rastrace/trccomponent.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* _GNU_SOURCE forces GLIBC_2.0 sscanf/vsscanf/fscanf for RHEL5 compatibility */ diff --git a/runtime/rastrace/trcengine.c b/runtime/rastrace/trcengine.c index a2f9dd64e82..31fe16cef37 100644 --- a/runtime/rastrace/trcengine.c +++ b/runtime/rastrace/trcengine.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/rastrace/trcformatter.c b/runtime/rastrace/trcformatter.c index adc539ea5c7..9508f331c7c 100644 --- a/runtime/rastrace/trcformatter.c +++ b/runtime/rastrace/trcformatter.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/rastrace/trclog.c b/runtime/rastrace/trclog.c index 93859077192..53fceac23e7 100644 --- a/runtime/rastrace/trclog.c +++ b/runtime/rastrace/trclog.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/rastrace/trcmain.c b/runtime/rastrace/trcmain.c index dc95822d54c..95d9ce89e1c 100644 --- a/runtime/rastrace/trcmain.c +++ b/runtime/rastrace/trcmain.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/rastrace/trcmisc.c b/runtime/rastrace/trcmisc.c index a6c52ae1ec8..a4a3a135718 100644 --- a/runtime/rastrace/trcmisc.c +++ b/runtime/rastrace/trcmisc.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/rastrace/trcoptions.c b/runtime/rastrace/trcoptions.c index 624925eff45..e990cdd46e0 100644 --- a/runtime/rastrace/trcoptions.c +++ b/runtime/rastrace/trcoptions.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/rastrace/trcqueue.c b/runtime/rastrace/trcqueue.c index 682295232a2..13bb0b2a595 100644 --- a/runtime/rastrace/trcqueue.c +++ b/runtime/rastrace/trcqueue.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "rastrace_internal.h" #include "omrthread.h" diff --git a/runtime/rastrace/trcqueue.h b/runtime/rastrace/trcqueue.h index 61d4f1f8e79..36ad4fdaf1e 100644 --- a/runtime/rastrace/trcqueue.h +++ b/runtime/rastrace/trcqueue.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TRCQUEUE_H diff --git a/runtime/rastrace/trctrigger.c b/runtime/rastrace/trctrigger.c index f8a8abca960..04ecfda3c1b 100644 --- a/runtime/rastrace/trctrigger.c +++ b/runtime/rastrace/trctrigger.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/rastrace/trctrigger.h b/runtime/rastrace/trctrigger.h index 3b9cccb9be3..89f826e2323 100644 --- a/runtime/rastrace/trctrigger.h +++ b/runtime/rastrace/trctrigger.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef trctrigger_h #define trctrigger_h diff --git a/runtime/rastrace/trcwrappers.c b/runtime/rastrace/trcwrappers.c index bf268894955..cd2c328b0db 100644 --- a/runtime/rastrace/trcwrappers.c +++ b/runtime/rastrace/trcwrappers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/redirector/CMakeLists.txt b/runtime/redirector/CMakeLists.txt index 6039fac6132..75134baeaaf 100644 --- a/runtime/redirector/CMakeLists.txt +++ b/runtime/redirector/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/redirector/forwarders.m4 b/runtime/redirector/forwarders.m4 index 0b2c635e3bd..c2afb5629e8 100644 --- a/runtime/redirector/forwarders.m4 +++ b/runtime/redirector/forwarders.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 dnl dnl (name,cc, decorate, ret, args..) _X(jio_vfprintf,,false,int,FILE *stream, const char *format, va_list args) diff --git a/runtime/redirector/generated.c.m4 b/runtime/redirector/generated.c.m4 index 9545deecf74..c9415a20232 100644 --- a/runtime/redirector/generated.c.m4 +++ b/runtime/redirector/generated.c.m4 @@ -18,7 +18,7 @@ changequote(`[',`]')dnl * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* generated.c */ #if defined(WIN32) diff --git a/runtime/redirector/module.xml b/runtime/redirector/module.xml index 171117c555f..6b861ae7526 100644 --- a/runtime/redirector/module.xml +++ b/runtime/redirector/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/redirector/redirector.c b/runtime/redirector/redirector.c index 2ca4d6a2cf4..0174dfa1651 100644 --- a/runtime/redirector/redirector.c +++ b/runtime/redirector/redirector.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if 0 diff --git a/runtime/runtimetools/CMakeLists.txt b/runtime/runtimetools/CMakeLists.txt index fde07180610..c29cb4710e1 100644 --- a/runtime/runtimetools/CMakeLists.txt +++ b/runtime/runtimetools/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_subdirectory(agentbase) diff --git a/runtime/runtimetools/agentbase/CMakeLists.txt b/runtime/runtimetools/agentbase/CMakeLists.txt index d7d74a0bd69..7e4e269db4a 100644 --- a/runtime/runtimetools/agentbase/CMakeLists.txt +++ b/runtime/runtimetools/agentbase/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.cpp b/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.cpp index 9398db8d02f..b3c4eb97948 100644 --- a/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.cpp +++ b/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" #include "j9memcategories.h" diff --git a/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.hpp b/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.hpp index 168a8769cde..2065e98e9c8 100644 --- a/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.hpp +++ b/runtime/runtimetools/agentbase/RuntimeToolsAgentBase.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_AGENTBASE_HPP_ #define RUNTIMETOOLS_AGENTBASE_HPP_ diff --git a/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.cpp b/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.cpp index cef29f85935..f7872af7d19 100644 --- a/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.cpp +++ b/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" #include "j9memcategories.h" diff --git a/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.hpp b/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.hpp index cb0903b5336..a7fac88a730 100644 --- a/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.hpp +++ b/runtime/runtimetools/agentbase/RuntimeToolsIntervalAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_INTERVALAGENT_HPP_ #define RUNTIMETOOLS_INTERVALAGENT_HPP_ diff --git a/runtime/runtimetools/agentbase/module.xml b/runtime/runtimetools/agentbase/module.xml index 83df6a7d0b5..3643f88828b 100644 --- a/runtime/runtimetools/agentbase/module.xml +++ b/runtime/runtimetools/agentbase/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/balloon/BalloonAgent.cpp b/runtime/runtimetools/balloon/BalloonAgent.cpp index 60c61ae0b03..d5676d9dc02 100644 --- a/runtime/runtimetools/balloon/BalloonAgent.cpp +++ b/runtime/runtimetools/balloon/BalloonAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "BalloonAgent.hpp" diff --git a/runtime/runtimetools/balloon/BalloonAgent.hpp b/runtime/runtimetools/balloon/BalloonAgent.hpp index 7b9891e000c..73f768162b5 100644 --- a/runtime/runtimetools/balloon/BalloonAgent.hpp +++ b/runtime/runtimetools/balloon/BalloonAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_BALLOONAGENT_HPP_ #define RUNTIMETOOLS_BALLOONAGENT_HPP_ diff --git a/runtime/runtimetools/balloon/CMakeLists.txt b/runtime/runtimetools/balloon/CMakeLists.txt index 0ce05a6765b..a99f6b97a49 100644 --- a/runtime/runtimetools/balloon/CMakeLists.txt +++ b/runtime/runtimetools/balloon/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/balloon/module.xml b/runtime/runtimetools/balloon/module.xml index 47fb2a4f211..a3abda8e974 100644 --- a/runtime/runtimetools/balloon/module.xml +++ b/runtime/runtimetools/balloon/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/javacoregen/CMakeLists.txt b/runtime/runtimetools/javacoregen/CMakeLists.txt index 4f699f7ef67..38632fc03e2 100644 --- a/runtime/runtimetools/javacoregen/CMakeLists.txt +++ b/runtime/runtimetools/javacoregen/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/javacoregen/JavacoreGenAgent.cpp b/runtime/runtimetools/javacoregen/JavacoreGenAgent.cpp index a7dde92bf2c..22f8e4c7e12 100644 --- a/runtime/runtimetools/javacoregen/JavacoreGenAgent.cpp +++ b/runtime/runtimetools/javacoregen/JavacoreGenAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JavacoreGenAgent.hpp" diff --git a/runtime/runtimetools/javacoregen/JavacoreGenAgent.hpp b/runtime/runtimetools/javacoregen/JavacoreGenAgent.hpp index df981866cbc..21c7831d98e 100644 --- a/runtime/runtimetools/javacoregen/JavacoreGenAgent.hpp +++ b/runtime/runtimetools/javacoregen/JavacoreGenAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_JAVACOREGENAGENT_HPP_ #define RUNTIMETOOLS_JAVACOREGENAGENT_HPP_ diff --git a/runtime/runtimetools/javacoregen/module.xml b/runtime/runtimetools/javacoregen/module.xml index d688e3f0c25..9fd62804953 100644 --- a/runtime/runtimetools/javacoregen/module.xml +++ b/runtime/runtimetools/javacoregen/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/jlm/CMakeLists.txt b/runtime/runtimetools/jlm/CMakeLists.txt index 9888e9cb137..2b8e8f28313 100644 --- a/runtime/runtimetools/jlm/CMakeLists.txt +++ b/runtime/runtimetools/jlm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/jlm/JLMAgent.cpp b/runtime/runtimetools/jlm/JLMAgent.cpp index 151a4bb8d23..42ad67ca915 100644 --- a/runtime/runtimetools/jlm/JLMAgent.cpp +++ b/runtime/runtimetools/jlm/JLMAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "JLMAgent.hpp" #include "ibmjvmti.h" diff --git a/runtime/runtimetools/jlm/JLMAgent.hpp b/runtime/runtimetools/jlm/JLMAgent.hpp index c5638b917f5..c0fb7581980 100644 --- a/runtime/runtimetools/jlm/JLMAgent.hpp +++ b/runtime/runtimetools/jlm/JLMAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_JLMAGENT_HPP_ #define RUNTIMETOOLS_JLMAGENT_HPP_ diff --git a/runtime/runtimetools/jlm/module.xml b/runtime/runtimetools/jlm/module.xml index a0ae1c92f6b..00d2dd76a45 100644 --- a/runtime/runtimetools/jlm/module.xml +++ b/runtime/runtimetools/jlm/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/memorywatcher/CMakeLists.txt b/runtime/runtimetools/memorywatcher/CMakeLists.txt index e9fce2a683c..81a727235ad 100644 --- a/runtime/runtimetools/memorywatcher/CMakeLists.txt +++ b/runtime/runtimetools/memorywatcher/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.cpp b/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.cpp index 70fe6d75305..7f82758eaf0 100644 --- a/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.cpp +++ b/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) #ifdef __cplusplus diff --git a/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.hpp b/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.hpp index cd9e7c7a4a7..30d1e7eef69 100644 --- a/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.hpp +++ b/runtime/runtimetools/memorywatcher/MemoryWatcherAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_MEMORYWATCHERAGENT_HPP_ #define RUNTIMETOOLS_MEMORYWATCHERAGENT_HPP_ diff --git a/runtime/runtimetools/memorywatcher/module.xml b/runtime/runtimetools/memorywatcher/module.xml index 6fb0548c9ae..49e091dfdba 100644 --- a/runtime/runtimetools/memorywatcher/module.xml +++ b/runtime/runtimetools/memorywatcher/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/migration/CMakeLists.txt b/runtime/runtimetools/migration/CMakeLists.txt index c842d4ba06a..be9bd148098 100644 --- a/runtime/runtimetools/migration/CMakeLists.txt +++ b/runtime/runtimetools/migration/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/migration/MigrationAgent.cpp b/runtime/runtimetools/migration/MigrationAgent.cpp index 8945df0a7a2..2fa13f992e5 100644 --- a/runtime/runtimetools/migration/MigrationAgent.cpp +++ b/runtime/runtimetools/migration/MigrationAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "MigrationAgent.hpp" diff --git a/runtime/runtimetools/migration/MigrationAgent.hpp b/runtime/runtimetools/migration/MigrationAgent.hpp index 30a8a280d35..12e82618546 100644 --- a/runtime/runtimetools/migration/MigrationAgent.hpp +++ b/runtime/runtimetools/migration/MigrationAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_MIGRATIONAGENT_HPP_ #define RUNTIMETOOLS_MIGRATIONAGENT_HPP_ diff --git a/runtime/runtimetools/migration/module.xml b/runtime/runtimetools/migration/module.xml index 980622428d5..9251fdef6c0 100644 --- a/runtime/runtimetools/migration/module.xml +++ b/runtime/runtimetools/migration/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/osmemory/CMakeLists.txt b/runtime/runtimetools/osmemory/CMakeLists.txt index 27b32f024b8..7eed9bb2366 100644 --- a/runtime/runtimetools/osmemory/CMakeLists.txt +++ b/runtime/runtimetools/osmemory/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/osmemory/OSMemoryAgent.cpp b/runtime/runtimetools/osmemory/OSMemoryAgent.cpp index 8aa2a790b99..e6fd92d2148 100644 --- a/runtime/runtimetools/osmemory/OSMemoryAgent.cpp +++ b/runtime/runtimetools/osmemory/OSMemoryAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OSMemoryAgent.hpp" diff --git a/runtime/runtimetools/osmemory/OSMemoryAgent.hpp b/runtime/runtimetools/osmemory/OSMemoryAgent.hpp index 415ecdf1947..cf6f1697971 100644 --- a/runtime/runtimetools/osmemory/OSMemoryAgent.hpp +++ b/runtime/runtimetools/osmemory/OSMemoryAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_OSMEMORYAGENT_HPP_ #define RUNTIMETOOLS_OSMEMORYAGENT_HPP_ diff --git a/runtime/runtimetools/osmemory/module.xml b/runtime/runtimetools/osmemory/module.xml index 112078dc245..bf33e03b8d5 100644 --- a/runtime/runtimetools/osmemory/module.xml +++ b/runtime/runtimetools/osmemory/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/perfscripts/perf-hottest b/runtime/runtimetools/perfscripts/perf-hottest index 5f76487ea5f..6003a6fffb0 100644 --- a/runtime/runtimetools/perfscripts/perf-hottest +++ b/runtime/runtimetools/perfscripts/perf-hottest @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # - # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # --------------------------------------------------------------------------- # # The performance profiling tool PERF generates data that can help to identify any performance issue in the Java JDKs. diff --git a/runtime/runtimetools/softmxtest/CMakeLists.txt b/runtime/runtimetools/softmxtest/CMakeLists.txt index 53f7cf426cb..927c6878bf5 100644 --- a/runtime/runtimetools/softmxtest/CMakeLists.txt +++ b/runtime/runtimetools/softmxtest/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/softmxtest/SoftMxTest.cpp b/runtime/runtimetools/softmxtest/SoftMxTest.cpp index 5364b1218cc..16f2b6aa813 100644 --- a/runtime/runtimetools/softmxtest/SoftMxTest.cpp +++ b/runtime/runtimetools/softmxtest/SoftMxTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "SoftMxTest.hpp" diff --git a/runtime/runtimetools/softmxtest/SoftMxTest.hpp b/runtime/runtimetools/softmxtest/SoftMxTest.hpp index 8ed3b93df36..413a9464a69 100644 --- a/runtime/runtimetools/softmxtest/SoftMxTest.hpp +++ b/runtime/runtimetools/softmxtest/SoftMxTest.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_SOFTMXTEST_HPP_ #define RUNTIMETOOLS_SOFTMXTEST_HPP_ diff --git a/runtime/runtimetools/softmxtest/module.xml b/runtime/runtimetools/softmxtest/module.xml index 5a1c90106eb..1c8ea5822a9 100644 --- a/runtime/runtimetools/softmxtest/module.xml +++ b/runtime/runtimetools/softmxtest/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/runtimetools/vmruntimestateagent/CMakeLists.txt b/runtime/runtimetools/vmruntimestateagent/CMakeLists.txt index 3b2ffca85fa..41ccb40c917 100644 --- a/runtime/runtimetools/vmruntimestateagent/CMakeLists.txt +++ b/runtime/runtimetools/vmruntimestateagent/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.cpp b/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.cpp index a8e34473d56..112d368edc5 100644 --- a/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.cpp +++ b/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VMRuntimeStateAgent.hpp" diff --git a/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.hpp b/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.hpp index f24f7e7ebd6..b0e6705c51e 100644 --- a/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.hpp +++ b/runtime/runtimetools/vmruntimestateagent/VMRuntimeStateAgent.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef RUNTIMETOOLS_VMRUNTIMESTATEAGENT_HPP_ #define RUNTIMETOOLS_VMRUNTIMESTATEAGENT_HPP_ diff --git a/runtime/runtimetools/vmruntimestateagent/module.xml b/runtime/runtimetools/vmruntimestateagent/module.xml index 070370a1421..cfb7c912f9d 100644 --- a/runtime/runtimetools/vmruntimestateagent/module.xml +++ b/runtime/runtimetools/vmruntimestateagent/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/shared/CMakeLists.txt b/runtime/shared/CMakeLists.txt index 214ff77e2a4..628b82ccc39 100644 --- a/runtime/shared/CMakeLists.txt +++ b/runtime/shared/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9shr SHARED diff --git a/runtime/shared/module.xml b/runtime/shared/module.xml index 7c96ec446f6..9a796ad587d 100644 --- a/runtime/shared/module.xml +++ b/runtime/shared/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/shared/shared_internal.h b/runtime/shared/shared_internal.h index 031fa8445e3..f3b83fbb86c 100644 --- a/runtime/shared/shared_internal.h +++ b/runtime/shared/shared_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef shared_internal_h diff --git a/runtime/shared/shr_bundle.h b/runtime/shared/shr_bundle.h index 7ce6260c702..57aaf844a61 100644 --- a/runtime/shared/shr_bundle.h +++ b/runtime/shared/shr_bundle.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/shared/shrclssup.c b/runtime/shared/shrclssup.c index 4417d8cad76..bb7dba23015 100644 --- a/runtime/shared/shrclssup.c +++ b/runtime/shared/shrclssup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/shared/shrclssup.h b/runtime/shared/shrclssup.h index 42fa679ca77..9b515d267b3 100644 --- a/runtime/shared/shrclssup.h +++ b/runtime/shared/shrclssup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/shared_common/AbstractMemoryPermission.hpp b/runtime/shared_common/AbstractMemoryPermission.hpp index 5021b9ff57f..7d551e79b6c 100644 --- a/runtime/shared_common/AbstractMemoryPermission.hpp +++ b/runtime/shared_common/AbstractMemoryPermission.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ABSTRACT_MEMORY_PERMS_HPP_INCLUDED) diff --git a/runtime/shared_common/AttachedDataManager.hpp b/runtime/shared_common/AttachedDataManager.hpp index 2c7786ddb1c..62ebf070e45 100644 --- a/runtime/shared_common/AttachedDataManager.hpp +++ b/runtime/shared_common/AttachedDataManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ATTACHED_DATA_MANAGER_HPP_INCLUDED) #define ATTACHED_DATA_MANAGER_HPP_INCLUDED diff --git a/runtime/shared_common/AttachedDataManagerImpl.cpp b/runtime/shared_common/AttachedDataManagerImpl.cpp index 2e6d80e19b3..65fe087d5b3 100644 --- a/runtime/shared_common/AttachedDataManagerImpl.cpp +++ b/runtime/shared_common/AttachedDataManagerImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/AttachedDataManagerImpl.hpp b/runtime/shared_common/AttachedDataManagerImpl.hpp index 9d5d2eadceb..1a1067714d1 100644 --- a/runtime/shared_common/AttachedDataManagerImpl.hpp +++ b/runtime/shared_common/AttachedDataManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ATTACHED_DATA_MANAGER_IMPL_HPP_INCLUDED) diff --git a/runtime/shared_common/ByteDataManager.hpp b/runtime/shared_common/ByteDataManager.hpp index 9eba0a62791..8ab27b559d8 100644 --- a/runtime/shared_common/ByteDataManager.hpp +++ b/runtime/shared_common/ByteDataManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ByteDataManagerImpl.cpp b/runtime/shared_common/ByteDataManagerImpl.cpp index 08298366571..c4c9b10588a 100644 --- a/runtime/shared_common/ByteDataManagerImpl.cpp +++ b/runtime/shared_common/ByteDataManagerImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ByteDataManagerImpl.hpp b/runtime/shared_common/ByteDataManagerImpl.hpp index 02f0c09efa5..7566d53d243 100644 --- a/runtime/shared_common/ByteDataManagerImpl.hpp +++ b/runtime/shared_common/ByteDataManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/CMakeLists.txt b/runtime/shared_common/CMakeLists.txt index 224a235a905..017fb8ade0e 100644 --- a/runtime/shared_common/CMakeLists.txt +++ b/runtime/shared_common/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_tracegen(j9shr.tdf) diff --git a/runtime/shared_common/CacheLifecycleManager.cpp b/runtime/shared_common/CacheLifecycleManager.cpp index 5cbc73cd7eb..96ee54156e4 100644 --- a/runtime/shared_common/CacheLifecycleManager.cpp +++ b/runtime/shared_common/CacheLifecycleManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/CacheLifecycleManager.hpp b/runtime/shared_common/CacheLifecycleManager.hpp index e926acba20f..9a3aa9d5248 100644 --- a/runtime/shared_common/CacheLifecycleManager.hpp +++ b/runtime/shared_common/CacheLifecycleManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CACHELIFECYCLEMANAGER_HPP_INCLUDE) diff --git a/runtime/shared_common/CacheMap.cpp b/runtime/shared_common/CacheMap.cpp index e9d117b0820..a83bfdab557 100644 --- a/runtime/shared_common/CacheMap.cpp +++ b/runtime/shared_common/CacheMap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CacheMap.hpp" #include "Managers.hpp" diff --git a/runtime/shared_common/CacheMap.hpp b/runtime/shared_common/CacheMap.hpp index b1e088cb7b8..10e5218e1f7 100644 --- a/runtime/shared_common/CacheMap.hpp +++ b/runtime/shared_common/CacheMap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CACHEMAP_H_INCLUDED) diff --git a/runtime/shared_common/CacheMapStats.hpp b/runtime/shared_common/CacheMapStats.hpp index 8f9827d823c..3ffcd08e9fa 100644 --- a/runtime/shared_common/CacheMapStats.hpp +++ b/runtime/shared_common/CacheMapStats.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CACHEMAPSTATS_H_INCLUDED) diff --git a/runtime/shared_common/ClassDebugDataProvider.cpp b/runtime/shared_common/ClassDebugDataProvider.cpp index 005aac63d94..7fa13eeab06 100644 --- a/runtime/shared_common/ClassDebugDataProvider.cpp +++ b/runtime/shared_common/ClassDebugDataProvider.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ClassDebugDataProvider.hpp b/runtime/shared_common/ClassDebugDataProvider.hpp index 193383dcc31..9a86c61dbf5 100644 --- a/runtime/shared_common/ClassDebugDataProvider.hpp +++ b/runtime/shared_common/ClassDebugDataProvider.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLASSDEBUGDATAPROVIDER_H_ diff --git a/runtime/shared_common/ClasspathItem.cpp b/runtime/shared_common/ClasspathItem.cpp index 022530f778d..950fdbb531a 100644 --- a/runtime/shared_common/ClasspathItem.cpp +++ b/runtime/shared_common/ClasspathItem.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ClasspathItem.hpp" diff --git a/runtime/shared_common/ClasspathItem.hpp b/runtime/shared_common/ClasspathItem.hpp index 2fbf7f45bc5..6cbb74738d3 100644 --- a/runtime/shared_common/ClasspathItem.hpp +++ b/runtime/shared_common/ClasspathItem.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef CLASSPATHITEM_HPP_INCLUDED diff --git a/runtime/shared_common/ClasspathManager.hpp b/runtime/shared_common/ClasspathManager.hpp index 56eedb9ed39..392e7bb5aa7 100644 --- a/runtime/shared_common/ClasspathManager.hpp +++ b/runtime/shared_common/ClasspathManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ClasspathManagerImpl2.cpp b/runtime/shared_common/ClasspathManagerImpl2.cpp index 6b6477ea7b7..93d597929d1 100644 --- a/runtime/shared_common/ClasspathManagerImpl2.cpp +++ b/runtime/shared_common/ClasspathManagerImpl2.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ClasspathManagerImpl2.hpp b/runtime/shared_common/ClasspathManagerImpl2.hpp index 346247220d4..6299d8673cd 100644 --- a/runtime/shared_common/ClasspathManagerImpl2.hpp +++ b/runtime/shared_common/ClasspathManagerImpl2.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CLASSPATHMANAGERIMPL_H_INCLUDED) diff --git a/runtime/shared_common/CompiledMethodManager.hpp b/runtime/shared_common/CompiledMethodManager.hpp index b9d18024ead..eae659176af 100644 --- a/runtime/shared_common/CompiledMethodManager.hpp +++ b/runtime/shared_common/CompiledMethodManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(COMPILED_METHOD_MANAGER_HPP_INCLUDED) #define COMPILED_METHOD_MANAGER_HPP_INCLUDED diff --git a/runtime/shared_common/CompiledMethodManagerImpl.cpp b/runtime/shared_common/CompiledMethodManagerImpl.cpp index bcf90eeeca6..c189e64431a 100644 --- a/runtime/shared_common/CompiledMethodManagerImpl.cpp +++ b/runtime/shared_common/CompiledMethodManagerImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/CompiledMethodManagerImpl.hpp b/runtime/shared_common/CompiledMethodManagerImpl.hpp index d72e0a3d106..10034ed8103 100644 --- a/runtime/shared_common/CompiledMethodManagerImpl.hpp +++ b/runtime/shared_common/CompiledMethodManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(COMPILED_METHOD_MANAGER_IMPL_HPP_INCLUDED) diff --git a/runtime/shared_common/CompositeCache.cpp b/runtime/shared_common/CompositeCache.cpp index 1c8bb51bc3d..a4528bd182c 100644 --- a/runtime/shared_common/CompositeCache.cpp +++ b/runtime/shared_common/CompositeCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/CompositeCache.hpp b/runtime/shared_common/CompositeCache.hpp index b31111f5504..423aac7607a 100644 --- a/runtime/shared_common/CompositeCache.hpp +++ b/runtime/shared_common/CompositeCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(COMPOSITECACHE_H_INCLUDED) #define COMPOSITECACHE_H_INCLUDED diff --git a/runtime/shared_common/CompositeCacheImpl.hpp b/runtime/shared_common/CompositeCacheImpl.hpp index dfcfc07f9c9..daf78889275 100644 --- a/runtime/shared_common/CompositeCacheImpl.hpp +++ b/runtime/shared_common/CompositeCacheImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(COMPOSITECACHEIMPL_H_INCLUDED) diff --git a/runtime/shared_common/Manager.cpp b/runtime/shared_common/Manager.cpp index 03b06a26aa0..9cac858b43b 100644 --- a/runtime/shared_common/Manager.cpp +++ b/runtime/shared_common/Manager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/Manager.hpp b/runtime/shared_common/Manager.hpp index c6e539127e9..ba3d3d132bc 100644 --- a/runtime/shared_common/Manager.hpp +++ b/runtime/shared_common/Manager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/Managers.cpp b/runtime/shared_common/Managers.cpp index 89b5d9ce2fb..4843889e524 100644 --- a/runtime/shared_common/Managers.cpp +++ b/runtime/shared_common/Managers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/Managers.hpp b/runtime/shared_common/Managers.hpp index 3d9a258b5a9..d82931e3ef7 100644 --- a/runtime/shared_common/Managers.hpp +++ b/runtime/shared_common/Managers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/OSCache.cpp b/runtime/shared_common/OSCache.cpp index 98079882c90..c54861c70dd 100644 --- a/runtime/shared_common/OSCache.cpp +++ b/runtime/shared_common/OSCache.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/OSCache.hpp b/runtime/shared_common/OSCache.hpp index a169d87f760..3967668e67d 100644 --- a/runtime/shared_common/OSCache.hpp +++ b/runtime/shared_common/OSCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHE_HPP_INCLUDED) #define OSCACHE_HPP_INCLUDED diff --git a/runtime/shared_common/OSCacheFile.cpp b/runtime/shared_common/OSCacheFile.cpp index 492d805e8db..7228b19e836 100644 --- a/runtime/shared_common/OSCacheFile.cpp +++ b/runtime/shared_common/OSCacheFile.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/OSCacheFile.hpp b/runtime/shared_common/OSCacheFile.hpp index 73193f2696d..86a2b200239 100644 --- a/runtime/shared_common/OSCacheFile.hpp +++ b/runtime/shared_common/OSCacheFile.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHEFILE_HPP_INCLUDED) #define OSCACHEFILE_HPP_INCLUDED diff --git a/runtime/shared_common/OSCachemmap.cpp b/runtime/shared_common/OSCachemmap.cpp index 0184bd2c7bb..29f8212bf32 100644 --- a/runtime/shared_common/OSCachemmap.cpp +++ b/runtime/shared_common/OSCachemmap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/OSCachemmap.hpp b/runtime/shared_common/OSCachemmap.hpp index 5a317a998f8..98a483ead5a 100644 --- a/runtime/shared_common/OSCachemmap.hpp +++ b/runtime/shared_common/OSCachemmap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHEMMAP_HPP_INCLUDED) #define OSCACHEMMAP_HPP_INCLUDED diff --git a/runtime/shared_common/OSCachesysv.cpp b/runtime/shared_common/OSCachesysv.cpp index b8adf0c196e..a10e92ccf73 100644 --- a/runtime/shared_common/OSCachesysv.cpp +++ b/runtime/shared_common/OSCachesysv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/OSCachesysv.hpp b/runtime/shared_common/OSCachesysv.hpp index 944078f861e..1d392884dfc 100644 --- a/runtime/shared_common/OSCachesysv.hpp +++ b/runtime/shared_common/OSCachesysv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHESYSV_HPP_INCLUDED) #define OSCACHESYSV_HPP_INCLUDED diff --git a/runtime/shared_common/ROMClassManager.hpp b/runtime/shared_common/ROMClassManager.hpp index eca1fd2515c..7c2ebb23f86 100644 --- a/runtime/shared_common/ROMClassManager.hpp +++ b/runtime/shared_common/ROMClassManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ROMClassManagerImpl.cpp b/runtime/shared_common/ROMClassManagerImpl.cpp index 3d3471944f6..eeb4c04bbf4 100644 --- a/runtime/shared_common/ROMClassManagerImpl.cpp +++ b/runtime/shared_common/ROMClassManagerImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ROMClassManagerImpl.hpp b/runtime/shared_common/ROMClassManagerImpl.hpp index a7178c4128f..74169329194 100644 --- a/runtime/shared_common/ROMClassManagerImpl.hpp +++ b/runtime/shared_common/ROMClassManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ROMClassResourceManager.cpp b/runtime/shared_common/ROMClassResourceManager.cpp index 8bc3f19b954..071b57f75e3 100644 --- a/runtime/shared_common/ROMClassResourceManager.cpp +++ b/runtime/shared_common/ROMClassResourceManager.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/shared_common/ROMClassResourceManager.hpp b/runtime/shared_common/ROMClassResourceManager.hpp index d548eaac6c1..89f2f5b2fa2 100644 --- a/runtime/shared_common/ROMClassResourceManager.hpp +++ b/runtime/shared_common/ROMClassResourceManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(ROMCLASS_RESOURCE_MANAGER_HPP_INCLUDED) #define ROMCLASS_RESOURCE_MANAGER_HPP_INCLUDED diff --git a/runtime/shared_common/SCImplementedAPI.cpp b/runtime/shared_common/SCImplementedAPI.cpp index d77acbdae76..26e68bc11a3 100644 --- a/runtime/shared_common/SCImplementedAPI.cpp +++ b/runtime/shared_common/SCImplementedAPI.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifdef __cplusplus extern "C" diff --git a/runtime/shared_common/SCImplementedAPI.hpp b/runtime/shared_common/SCImplementedAPI.hpp index 846dbec4070..965fd481fcb 100644 --- a/runtime/shared_common/SCImplementedAPI.hpp +++ b/runtime/shared_common/SCImplementedAPI.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SCIMPLEMENTEDAPI_H_) #define SCIMPLEMENTEDAPI_H_ diff --git a/runtime/shared_common/ScopeManager.hpp b/runtime/shared_common/ScopeManager.hpp index 6de189c8ce3..043287f94e7 100644 --- a/runtime/shared_common/ScopeManager.hpp +++ b/runtime/shared_common/ScopeManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ScopeManagerImpl.cpp b/runtime/shared_common/ScopeManagerImpl.cpp index ca0931d167b..0414804ff69 100644 --- a/runtime/shared_common/ScopeManagerImpl.cpp +++ b/runtime/shared_common/ScopeManagerImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/ScopeManagerImpl.hpp b/runtime/shared_common/ScopeManagerImpl.hpp index e45c3e04982..c5340503c11 100644 --- a/runtime/shared_common/ScopeManagerImpl.hpp +++ b/runtime/shared_common/ScopeManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/SharedCache.hpp b/runtime/shared_common/SharedCache.hpp index cfecdb499e0..c7a1df5e74c 100644 --- a/runtime/shared_common/SharedCache.hpp +++ b/runtime/shared_common/SharedCache.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/TimestampManager.hpp b/runtime/shared_common/TimestampManager.hpp index dbcd784ddad..87bc474be17 100644 --- a/runtime/shared_common/TimestampManager.hpp +++ b/runtime/shared_common/TimestampManager.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TIMESTAMPMANAGER_HPP_INCLUDED) diff --git a/runtime/shared_common/TimestampManagerImpl.cpp b/runtime/shared_common/TimestampManagerImpl.cpp index c16f6494ee0..e8099b8a2c7 100644 --- a/runtime/shared_common/TimestampManagerImpl.cpp +++ b/runtime/shared_common/TimestampManagerImpl.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "TimestampManagerImpl.hpp" diff --git a/runtime/shared_common/TimestampManagerImpl.hpp b/runtime/shared_common/TimestampManagerImpl.hpp index 701ce9b9f00..7807a38351b 100644 --- a/runtime/shared_common/TimestampManagerImpl.hpp +++ b/runtime/shared_common/TimestampManagerImpl.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TIMESTAMPMANAGERIMPL_HPP_INCLUDED) diff --git a/runtime/shared_common/UnitTest.hpp b/runtime/shared_common/UnitTest.hpp index 18aea0292dc..3d57750b5ab 100644 --- a/runtime/shared_common/UnitTest.hpp +++ b/runtime/shared_common/UnitTest.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/shared_common/hookhelpers.cpp b/runtime/shared_common/hookhelpers.cpp index c71527c8812..fe3ffd1dc4e 100644 --- a/runtime/shared_common/hookhelpers.cpp +++ b/runtime/shared_common/hookhelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "hookhelpers.hpp" #include "CacheMap.hpp" diff --git a/runtime/shared_common/hookhelpers.hpp b/runtime/shared_common/hookhelpers.hpp index 03819324bd0..eba3588bda9 100644 --- a/runtime/shared_common/hookhelpers.hpp +++ b/runtime/shared_common/hookhelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_HOOK_HELPERS_HPP) diff --git a/runtime/shared_common/include/SCAbstractAPI.h b/runtime/shared_common/include/SCAbstractAPI.h index ee1f32fdd23..233de9004ef 100644 --- a/runtime/shared_common/include/SCAbstractAPI.h +++ b/runtime/shared_common/include/SCAbstractAPI.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_ABSTRACT_API_H_INCLUDED) diff --git a/runtime/shared_common/include/SCQueryFunctions.h b/runtime/shared_common/include/SCQueryFunctions.h index 9afaa41f55c..cc7e5048498 100644 --- a/runtime/shared_common/include/SCQueryFunctions.h +++ b/runtime/shared_common/include/SCQueryFunctions.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_SCQUERYFUNCTIONS_H) diff --git a/runtime/shared_common/include/SCStoreTransaction.hpp b/runtime/shared_common/include/SCStoreTransaction.hpp index 5f2adf27c1c..26ff763b747 100644 --- a/runtime/shared_common/include/SCStoreTransaction.hpp +++ b/runtime/shared_common/include/SCStoreTransaction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_STORE_TRANSACTION_HPP_INCLUDED) diff --git a/runtime/shared_common/include/SCStringInternHelpers.h b/runtime/shared_common/include/SCStringInternHelpers.h index a42ec6f7e32..b3221648a2c 100644 --- a/runtime/shared_common/include/SCStringInternHelpers.h +++ b/runtime/shared_common/include/SCStringInternHelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_STRING_INTERN_TYPES_H_INCLUDED) diff --git a/runtime/shared_common/include/SCStringTransaction.hpp b/runtime/shared_common/include/SCStringTransaction.hpp index 0392ed85dba..6abe8b79b85 100644 --- a/runtime/shared_common/include/SCStringTransaction.hpp +++ b/runtime/shared_common/include/SCStringTransaction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_STRING_TRANSACTION_HPP_INCLUDED) diff --git a/runtime/shared_common/include/SCTransactionCTypes.h b/runtime/shared_common/include/SCTransactionCTypes.h index fd3d090d048..bced0732423 100644 --- a/runtime/shared_common/include/SCTransactionCTypes.h +++ b/runtime/shared_common/include/SCTransactionCTypes.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_TRANSACTION_CTYPES_H_INCLUDED) diff --git a/runtime/shared_common/include/module.xml b/runtime/shared_common/include/module.xml index 54b825d68fb..db4c92e1b58 100644 --- a/runtime/shared_common/include/module.xml +++ b/runtime/shared_common/include/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/shared_common/j9shr.tdf b/runtime/shared_common/j9shr.tdf index 4ec036ac7a0..f8d5c358ffc 100644 --- a/runtime/shared_common/j9shr.tdf +++ b/runtime/shared_common/j9shr.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=j9shr diff --git a/runtime/shared_common/module.xml b/runtime/shared_common/module.xml index 5f9c550d627..4feaf9b7da1 100644 --- a/runtime/shared_common/module.xml +++ b/runtime/shared_common/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/shared_common/sharedconsts.h b/runtime/shared_common/sharedconsts.h index f2c1105a6ad..5ef525ca20c 100644 --- a/runtime/shared_common/sharedconsts.h +++ b/runtime/shared_common/sharedconsts.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef SHAREDCONSTS_H_ #define SHAREDCONSTS_H_ diff --git a/runtime/shared_common/shrinit.cpp b/runtime/shared_common/shrinit.cpp index f1d263fb6e8..5a19238a674 100644 --- a/runtime/shared_common/shrinit.cpp +++ b/runtime/shared_common/shrinit.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_common/shrinit.h b/runtime/shared_common/shrinit.h index 318f6be05f1..e2f6ae4809c 100644 --- a/runtime/shared_common/shrinit.h +++ b/runtime/shared_common/shrinit.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SHRINIT_H_INCLUDED) diff --git a/runtime/shared_util/CMakeLists.txt b/runtime/shared_util/CMakeLists.txt index 4c57cd0556f..cb7877dc927 100644 --- a/runtime/shared_util/CMakeLists.txt +++ b/runtime/shared_util/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9shrutil STATIC diff --git a/runtime/shared_util/classpathcache.c b/runtime/shared_util/classpathcache.c index 18e9b6bba61..f3eda1ac880 100644 --- a/runtime/shared_util/classpathcache.c +++ b/runtime/shared_util/classpathcache.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/shared_util/classpathcache.h b/runtime/shared_util/classpathcache.h index cfa3f19fff2..e0f293f8c40 100644 --- a/runtime/shared_util/classpathcache.h +++ b/runtime/shared_util/classpathcache.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef classpathcache_h #define classpathcache_h diff --git a/runtime/shared_util/module.xml b/runtime/shared_util/module.xml index 5939f7a5eea..27e4d312882 100644 --- a/runtime/shared_util/module.xml +++ b/runtime/shared_util/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/shared_util/shcdatautils.c b/runtime/shared_util/shcdatautils.c index 2bf8e3dec8a..81442aa3952 100644 --- a/runtime/shared_util/shcdatautils.c +++ b/runtime/shared_util/shcdatautils.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "shcdatautils.h" diff --git a/runtime/simplepool/CMakeLists.txt b/runtime/simplepool/CMakeLists.txt index 44c4ac344ad..571e8c90fbd 100644 --- a/runtime/simplepool/CMakeLists.txt +++ b/runtime/simplepool/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_tracegen(simplepool.tdf) diff --git a/runtime/simplepool/DoxygenSupport.txt b/runtime/simplepool/DoxygenSupport.txt index 2c773ca75cc..72dceee795f 100644 --- a/runtime/simplepool/DoxygenSupport.txt +++ b/runtime/simplepool/DoxygenSupport.txt @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/simplepool/module.xml b/runtime/simplepool/module.xml index e62ce8c78d2..dcbd73c353d 100644 --- a/runtime/simplepool/module.xml +++ b/runtime/simplepool/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/simplepool/simplepool.c b/runtime/simplepool/simplepool.c index 09207787ca5..dc09664f5db 100644 --- a/runtime/simplepool/simplepool.c +++ b/runtime/simplepool/simplepool.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/simplepool/simplepool.tdf b/runtime/simplepool/simplepool.tdf index 7a921c3084f..44f8303f438 100644 --- a/runtime/simplepool/simplepool.tdf +++ b/runtime/simplepool/simplepool.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=simplepool diff --git a/runtime/stackmap/CMakeLists.txt b/runtime/stackmap/CMakeLists.txt index 382987d487c..ff337df8ff8 100644 --- a/runtime/stackmap/CMakeLists.txt +++ b/runtime/stackmap/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/stackmap/debuglocalmap.c b/runtime/stackmap/debuglocalmap.c index 322dc8f44aa..78baafd2c32 100644 --- a/runtime/stackmap/debuglocalmap.c +++ b/runtime/stackmap/debuglocalmap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/stackmap/fixreturns.c b/runtime/stackmap/fixreturns.c index 75e83c45a65..2f1cb3e1212 100644 --- a/runtime/stackmap/fixreturns.c +++ b/runtime/stackmap/fixreturns.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "stackmap_internal.h" diff --git a/runtime/stackmap/localmap.c b/runtime/stackmap/localmap.c index 86e5b8a5ed5..d9907e796b2 100644 --- a/runtime/stackmap/localmap.c +++ b/runtime/stackmap/localmap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/stackmap/map.tdf b/runtime/stackmap/map.tdf index 42cf0bd7e46..df47d20c680 100644 --- a/runtime/stackmap/map.tdf +++ b/runtime/stackmap/map.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=map diff --git a/runtime/stackmap/mapmemorybuffer.c b/runtime/stackmap/mapmemorybuffer.c index b363fc1e325..6e41c5720da 100644 --- a/runtime/stackmap/mapmemorybuffer.c +++ b/runtime/stackmap/mapmemorybuffer.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/stackmap/maxmap.c b/runtime/stackmap/maxmap.c index 70f42a2d3d5..b1862a0c9bf 100644 --- a/runtime/stackmap/maxmap.c +++ b/runtime/stackmap/maxmap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/stackmap/module.xml b/runtime/stackmap/module.xml index f396682ca96..5803dd784fb 100644 --- a/runtime/stackmap/module.xml +++ b/runtime/stackmap/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/stackmap/stackmap.c b/runtime/stackmap/stackmap.c index 785ffbf6b0e..d556673232c 100644 --- a/runtime/stackmap/stackmap.c +++ b/runtime/stackmap/stackmap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/stackmap/stackmap_internal.h b/runtime/stackmap/stackmap_internal.h index 93d4b521edf..eb88c83f33e 100644 --- a/runtime/stackmap/stackmap_internal.h +++ b/runtime/stackmap/stackmap_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef stackmap_internal_h diff --git a/runtime/sunvmi/CMakeLists.txt b/runtime/sunvmi/CMakeLists.txt index fc738c91fdd..d910b5ccdcb 100644 --- a/runtime/sunvmi/CMakeLists.txt +++ b/runtime/sunvmi/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/sunvmi/module.xml b/runtime/sunvmi/module.xml index f07549a879a..a09e194d71c 100644 --- a/runtime/sunvmi/module.xml +++ b/runtime/sunvmi/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/sunvmi/sunvmi.c b/runtime/sunvmi/sunvmi.c index 67be9196724..558506d0f8c 100644 --- a/runtime/sunvmi/sunvmi.c +++ b/runtime/sunvmi/sunvmi.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/sunvmi/sunvmi.tdf b/runtime/sunvmi/sunvmi.tdf index e5d046b742b..8af889ed044 100644 --- a/runtime/sunvmi/sunvmi.tdf +++ b/runtime/sunvmi/sunvmi.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=sunvmi diff --git a/runtime/tests/CMakeLists.txt b/runtime/tests/CMakeLists.txt index 7dac1c80784..87f24c2c5fb 100644 --- a/runtime/tests/CMakeLists.txt +++ b/runtime/tests/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ if(OMR_OS_AIX) diff --git a/runtime/tests/aixerrmsg/CMakeLists.txt b/runtime/tests/aixerrmsg/CMakeLists.txt index 0c5840bd104..66b743fa05a 100644 --- a/runtime/tests/aixerrmsg/CMakeLists.txt +++ b/runtime/tests/aixerrmsg/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ diff --git a/runtime/tests/aixerrmsg/agent.c b/runtime/tests/aixerrmsg/agent.c index 3316a8b7084..b4a756ede23 100644 --- a/runtime/tests/aixerrmsg/agent.c +++ b/runtime/tests/aixerrmsg/agent.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/aixerrmsg/module.xml b/runtime/tests/aixerrmsg/module.xml index 4740e4bcb20..c25de7366cf 100644 --- a/runtime/tests/aixerrmsg/module.xml +++ b/runtime/tests/aixerrmsg/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/algorithm/CMakeLists.txt b/runtime/tests/algorithm/CMakeLists.txt index 7ed29ec08ce..3e11e72a99e 100644 --- a/runtime/tests/algorithm/CMakeLists.txt +++ b/runtime/tests/algorithm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/algorithm/algorithm_test_internal.h b/runtime/tests/algorithm/algorithm_test_internal.h index 900647f5dd9..9bb7c26f755 100644 --- a/runtime/tests/algorithm/algorithm_test_internal.h +++ b/runtime/tests/algorithm/algorithm_test_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef algorithm_test_internal_h diff --git a/runtime/tests/algorithm/algotest.c b/runtime/tests/algorithm/algotest.c index 39815935b82..7dc018d6176 100644 --- a/runtime/tests/algorithm/algotest.c +++ b/runtime/tests/algorithm/algotest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/algorithm/algotest.h b/runtime/tests/algorithm/algotest.h index 4c9c8fee85c..fe471df163d 100644 --- a/runtime/tests/algorithm/algotest.h +++ b/runtime/tests/algorithm/algotest.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/tests/algorithm/argscantest.c b/runtime/tests/algorithm/argscantest.c index 5878e98d9ab..eaa64e25f01 100644 --- a/runtime/tests/algorithm/argscantest.c +++ b/runtime/tests/algorithm/argscantest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/algorithm/module.xml b/runtime/tests/algorithm/module.xml index d83f5aafd25..dd94d8c9158 100644 --- a/runtime/tests/algorithm/module.xml +++ b/runtime/tests/algorithm/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/algorithm/primenumberhelpertest.c b/runtime/tests/algorithm/primenumberhelpertest.c index 69cf5917adc..ab218d24c91 100644 --- a/runtime/tests/algorithm/primenumberhelpertest.c +++ b/runtime/tests/algorithm/primenumberhelpertest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/algorithm/sendslottest.c b/runtime/tests/algorithm/sendslottest.c index 28eb41f2a6f..09937096a22 100644 --- a/runtime/tests/algorithm/sendslottest.c +++ b/runtime/tests/algorithm/sendslottest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/tests/algorithm/simplepooltest.c b/runtime/tests/algorithm/simplepooltest.c index 1c83dcf7f5d..5bc0e877186 100644 --- a/runtime/tests/algorithm/simplepooltest.c +++ b/runtime/tests/algorithm/simplepooltest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/tests/algorithm/srphashtabletest.c b/runtime/tests/algorithm/srphashtabletest.c index c314d98dead..4523cf32f44 100644 --- a/runtime/tests/algorithm/srphashtabletest.c +++ b/runtime/tests/algorithm/srphashtabletest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/algorithm/wildcardtest.c b/runtime/tests/algorithm/wildcardtest.c index fb4a7ff0d6d..7f5a9d2c2e5 100644 --- a/runtime/tests/algorithm/wildcardtest.c +++ b/runtime/tests/algorithm/wildcardtest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/annotationtests/CMakeLists.txt b/runtime/tests/annotationtests/CMakeLists.txt index dc8c9cf873d..ba09aed3c00 100644 --- a/runtime/tests/annotationtests/CMakeLists.txt +++ b/runtime/tests/annotationtests/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/annotationtests/annhelp_tests.c b/runtime/tests/annotationtests/annhelp_tests.c index 3144a925103..522bb56a6c4 100644 --- a/runtime/tests/annotationtests/annhelp_tests.c +++ b/runtime/tests/annotationtests/annhelp_tests.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "vmaccess.h" diff --git a/runtime/tests/annotationtests/module.xml b/runtime/tests/annotationtests/module.xml index f5f78edd44c..55339b96a23 100644 --- a/runtime/tests/annotationtests/module.xml +++ b/runtime/tests/annotationtests/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/bcprof/CMakeLists.txt b/runtime/tests/bcprof/CMakeLists.txt index c78407e3b77..f9c7427fd7c 100644 --- a/runtime/tests/bcprof/CMakeLists.txt +++ b/runtime/tests/bcprof/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(bcproftest SHARED diff --git a/runtime/tests/bcprof/bcproftest.c b/runtime/tests/bcprof/bcproftest.c index 3d887b6975d..52d66d9899f 100644 --- a/runtime/tests/bcprof/bcproftest.c +++ b/runtime/tests/bcprof/bcproftest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/bcprof/bcproftest_internal.h b/runtime/tests/bcprof/bcproftest_internal.h index 3cbb3519ff1..5512aa065d3 100644 --- a/runtime/tests/bcprof/bcproftest_internal.h +++ b/runtime/tests/bcprof/bcproftest_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef bcproftest_internal_h diff --git a/runtime/tests/bcprof/module.xml b/runtime/tests/bcprof/module.xml index ff595012c37..7a841098a63 100644 --- a/runtime/tests/bcprof/module.xml +++ b/runtime/tests/bcprof/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/bcverify/CMakeLists.txt b/runtime/tests/bcverify/CMakeLists.txt index 75769388d9a..22b2d9617aa 100644 --- a/runtime/tests/bcverify/CMakeLists.txt +++ b/runtime/tests/bcverify/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/bcverify/natives/bcvnatives.c b/runtime/tests/bcverify/natives/bcvnatives.c index cc472364604..91299da02a5 100644 --- a/runtime/tests/bcverify/natives/bcvnatives.c +++ b/runtime/tests/bcverify/natives/bcvnatives.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/bcverify/natives/module.xml b/runtime/tests/bcverify/natives/module.xml index 4c8a6c9be2d..ddd6ff07f86 100644 --- a/runtime/tests/bcverify/natives/module.xml +++ b/runtime/tests/bcverify/natives/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/bcverify/relationships/bcvrelationships.c b/runtime/tests/bcverify/relationships/bcvrelationships.c index 377ee7ec3cf..55e23881962 100644 --- a/runtime/tests/bcverify/relationships/bcvrelationships.c +++ b/runtime/tests/bcverify/relationships/bcvrelationships.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/bcverify/relationships/module.xml b/runtime/tests/bcverify/relationships/module.xml index 9ecd81f8c8a..df51165b914 100644 --- a/runtime/tests/bcverify/relationships/module.xml +++ b/runtime/tests/bcverify/relationships/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/bcverify/unit/Suite.cpp b/runtime/tests/bcverify/unit/Suite.cpp index 80b22116101..77754b9fccd 100644 --- a/runtime/tests/bcverify/unit/Suite.cpp +++ b/runtime/tests/bcverify/unit/Suite.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CuTest.h" #include diff --git a/runtime/tests/bcverify/unit/main.cpp b/runtime/tests/bcverify/unit/main.cpp index e94c5fd3b7e..81cb4e3ce2c 100644 --- a/runtime/tests/bcverify/unit/main.cpp +++ b/runtime/tests/bcverify/unit/main.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/tests/bcverify/unit/module.xml b/runtime/tests/bcverify/unit/module.xml index 03762b13a30..3cad3105e50 100644 --- a/runtime/tests/bcverify/unit/module.xml +++ b/runtime/tests/bcverify/unit/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/clinkerffi/CMakeLists.txt b/runtime/tests/clinkerffi/CMakeLists.txt index 5fc0fda47a0..8668b0d6acc 100644 --- a/runtime/tests/clinkerffi/CMakeLists.txt +++ b/runtime/tests/clinkerffi/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/clinkerffi/downcall.c b/runtime/tests/clinkerffi/downcall.c index b18606de239..0ced25e220f 100644 --- a/runtime/tests/clinkerffi/downcall.c +++ b/runtime/tests/clinkerffi/downcall.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/clinkerffi/downcall.h b/runtime/tests/clinkerffi/downcall.h index 73da8cf1ac0..0a3fe1c7798 100644 --- a/runtime/tests/clinkerffi/downcall.h +++ b/runtime/tests/clinkerffi/downcall.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/clinkerffi/module.xml b/runtime/tests/clinkerffi/module.xml index ddfa45466e3..0a458ed7dc1 100644 --- a/runtime/tests/clinkerffi/module.xml +++ b/runtime/tests/clinkerffi/module.xml @@ -19,7 +19,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/clinkerffi/upcall.c b/runtime/tests/clinkerffi/upcall.c index 007d630c126..17c40f761b3 100644 --- a/runtime/tests/clinkerffi/upcall.c +++ b/runtime/tests/clinkerffi/upcall.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/clinkerffi/valist.c b/runtime/tests/clinkerffi/valist.c index a968698b3aa..49ad5e85d57 100644 --- a/runtime/tests/clinkerffi/valist.c +++ b/runtime/tests/clinkerffi/valist.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/cutest/CMakeLists.txt b/runtime/tests/cutest/CMakeLists.txt index 33aa5e97b57..c0a06a35c16 100644 --- a/runtime/tests/cutest/CMakeLists.txt +++ b/runtime/tests/cutest/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(cutest STATIC diff --git a/runtime/tests/cutest/XMLBenchOutputWriter.cpp b/runtime/tests/cutest/XMLBenchOutputWriter.cpp index ee481e2ee47..2f71e618284 100644 --- a/runtime/tests/cutest/XMLBenchOutputWriter.cpp +++ b/runtime/tests/cutest/XMLBenchOutputWriter.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/cutest/XMLBenchOutputWriter.hpp b/runtime/tests/cutest/XMLBenchOutputWriter.hpp index 13a9d101e3c..5e4fed018ab 100644 --- a/runtime/tests/cutest/XMLBenchOutputWriter.hpp +++ b/runtime/tests/cutest/XMLBenchOutputWriter.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef XMLBENCHOUTPUTWRITER_HPP_ #define XMLBENCHOUTPUTWRITER_HPP_ diff --git a/runtime/tests/cutest/about.html b/runtime/tests/cutest/about.html index 2f9e7957c48..318a34e25c2 100644 --- a/runtime/tests/cutest/about.html +++ b/runtime/tests/cutest/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/runtime/tests/cutest/module.xml b/runtime/tests/cutest/module.xml index c02219c9d36..13d21020d06 100644 --- a/runtime/tests/cutest/module.xml +++ b/runtime/tests/cutest/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/cutest/parser.c b/runtime/tests/cutest/parser.c index 9388671b3cf..2babf5ee86a 100644 --- a/runtime/tests/cutest/parser.c +++ b/runtime/tests/cutest/parser.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "j9port.h" diff --git a/runtime/tests/gp/CMakeLists.txt b/runtime/tests/gp/CMakeLists.txt index 544e2c0908c..920679524d7 100644 --- a/runtime/tests/gp/CMakeLists.txt +++ b/runtime/tests/gp/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/gp/gptest.c b/runtime/tests/gp/gptest.c index b8485785b9a..a2416c3cb17 100644 --- a/runtime/tests/gp/gptest.c +++ b/runtime/tests/gp/gptest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/gp/gptest.tdf b/runtime/tests/gp/gptest.tdf index 50d032f67ca..4981226a610 100644 --- a/runtime/tests/gp/gptest.tdf +++ b/runtime/tests/gp/gptest.tdf @@ -17,7 +17,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 //****************************************************************************** Executable=gptest diff --git a/runtime/tests/gp/gptest_internal.h b/runtime/tests/gp/gptest_internal.h index 9e53f1f71cb..cc9239332cc 100644 --- a/runtime/tests/gp/gptest_internal.h +++ b/runtime/tests/gp/gptest_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef gptest_internal_h diff --git a/runtime/tests/gp/module.xml b/runtime/tests/gp/module.xml index f2d4c4f68e6..d834c279526 100644 --- a/runtime/tests/gp/module.xml +++ b/runtime/tests/gp/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/j9vm/CMakeLists.txt b/runtime/tests/j9vm/CMakeLists.txt index 7a180ace397..b0bc9986f69 100644 --- a/runtime/tests/j9vm/CMakeLists.txt +++ b/runtime/tests/j9vm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9vmtest SHARED diff --git a/runtime/tests/j9vm/jvmjni.c b/runtime/tests/j9vm/jvmjni.c index ac0c4a21221..6ff8578756e 100644 --- a/runtime/tests/j9vm/jvmjni.c +++ b/runtime/tests/j9vm/jvmjni.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Avoid renaming malloc/free */ diff --git a/runtime/tests/j9vm/module.xml b/runtime/tests/j9vm/module.xml index 1e3fda68b92..952dce5f984 100644 --- a/runtime/tests/j9vm/module.xml +++ b/runtime/tests/j9vm/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jni/CMakeLists.txt b/runtime/tests/jni/CMakeLists.txt index efe68bf8291..f897f3f05dc 100644 --- a/runtime/tests/jni/CMakeLists.txt +++ b/runtime/tests/jni/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/jni/DeadlockNativeTest.c b/runtime/tests/jni/DeadlockNativeTest.c index 3a8db4eb1fd..c5593b38ad0 100644 --- a/runtime/tests/jni/DeadlockNativeTest.c +++ b/runtime/tests/jni/DeadlockNativeTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" #include "j9protos.h" diff --git a/runtime/tests/jni/critical.c b/runtime/tests/jni/critical.c index a55db07f949..f47d8cef20f 100644 --- a/runtime/tests/jni/critical.c +++ b/runtime/tests/jni/critical.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" diff --git a/runtime/tests/jni/exports.cmake b/runtime/tests/jni/exports.cmake index bb444029a76..618dd5b4fe3 100644 --- a/runtime/tests/jni/exports.cmake +++ b/runtime/tests/jni/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_exports(j9ben diff --git a/runtime/tests/jni/jniReturnInvalidReference.c b/runtime/tests/jni/jniReturnInvalidReference.c index 380298a6c00..c9cab5ede38 100644 --- a/runtime/tests/jni/jniReturnInvalidReference.c +++ b/runtime/tests/jni/jniReturnInvalidReference.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" diff --git a/runtime/tests/jni/jnibench.c b/runtime/tests/jni/jnibench.c index 7102e21e2f8..4bc3ddf28f4 100644 --- a/runtime/tests/jni/jnibench.c +++ b/runtime/tests/jni/jnibench.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" diff --git a/runtime/tests/jni/jnierrors.c b/runtime/tests/jni/jnierrors.c index a89b88893d1..cbe890020f6 100644 --- a/runtime/tests/jni/jnierrors.c +++ b/runtime/tests/jni/jnierrors.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" diff --git a/runtime/tests/jni/jnimark.c b/runtime/tests/jni/jnimark.c index 903f72c2b0b..f9513634b66 100644 --- a/runtime/tests/jni/jnimark.c +++ b/runtime/tests/jni/jnimark.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include /* Header for class com_ibm_j9_jnimark_Natives */ diff --git a/runtime/tests/jni/jnitest.c b/runtime/tests/jni/jnitest.c index fa1fa2d4a81..8aca8802c35 100644 --- a/runtime/tests/jni/jnitest.c +++ b/runtime/tests/jni/jnitest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" diff --git a/runtime/tests/jni/jnitest_internal.h b/runtime/tests/jni/jnitest_internal.h index ce6a388952c..d48e1abdbcf 100644 --- a/runtime/tests/jni/jnitest_internal.h +++ b/runtime/tests/jni/jnitest_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jnitest_internal_h diff --git a/runtime/tests/jni/memoryCheckTest.c b/runtime/tests/jni/memoryCheckTest.c index 9f6c8f0aa05..916b46ce9cd 100644 --- a/runtime/tests/jni/memoryCheckTest.c +++ b/runtime/tests/jni/memoryCheckTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/tests/jni/module.xml b/runtime/tests/jni/module.xml index 4f2c625a7fd..9c7c2e89822 100644 --- a/runtime/tests/jni/module.xml +++ b/runtime/tests/jni/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jni/montest.c b/runtime/tests/jni/montest.c index 2d474a1e368..986e96c1f76 100644 --- a/runtime/tests/jni/montest.c +++ b/runtime/tests/jni/montest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" diff --git a/runtime/tests/jni/objectfieldutils.c b/runtime/tests/jni/objectfieldutils.c index eeeb1afeb85..73e31262a46 100644 --- a/runtime/tests/jni/objectfieldutils.c +++ b/runtime/tests/jni/objectfieldutils.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" jint JNICALL diff --git a/runtime/tests/jni/reattach.c b/runtime/tests/jni/reattach.c index 7aff367592c..8bee888c38e 100644 --- a/runtime/tests/jni/reattach.c +++ b/runtime/tests/jni/reattach.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" #include "j9protos.h" diff --git a/runtime/tests/jni/threadtest.c b/runtime/tests/jni/threadtest.c index 347571fd8ad..ea79098890c 100644 --- a/runtime/tests/jni/threadtest.c +++ b/runtime/tests/jni/threadtest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnitest_internal.h" #include "j9protos.h" diff --git a/runtime/tests/jniarg/CMakeLists.txt b/runtime/tests/jniarg/CMakeLists.txt index da137f3f4bc..9059a896bdd 100644 --- a/runtime/tests/jniarg/CMakeLists.txt +++ b/runtime/tests/jniarg/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/jniarg/args_01.c b/runtime/tests/jniarg/args_01.c index 10c50c10fb4..c113868aafe 100644 --- a/runtime/tests/jniarg/args_01.c +++ b/runtime/tests/jniarg/args_01.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_02.c b/runtime/tests/jniarg/args_02.c index 46405ac97d7..ac8618e41b7 100644 --- a/runtime/tests/jniarg/args_02.c +++ b/runtime/tests/jniarg/args_02.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_03.c b/runtime/tests/jniarg/args_03.c index 97a45a975a0..ed55ad19948 100644 --- a/runtime/tests/jniarg/args_03.c +++ b/runtime/tests/jniarg/args_03.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_04.c b/runtime/tests/jniarg/args_04.c index 1001a1e2f6d..6cc8267f67d 100644 --- a/runtime/tests/jniarg/args_04.c +++ b/runtime/tests/jniarg/args_04.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_05.c b/runtime/tests/jniarg/args_05.c index 79888a5932c..97b4186f851 100644 --- a/runtime/tests/jniarg/args_05.c +++ b/runtime/tests/jniarg/args_05.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_06.c b/runtime/tests/jniarg/args_06.c index 56a06bef11a..105ed941508 100644 --- a/runtime/tests/jniarg/args_06.c +++ b/runtime/tests/jniarg/args_06.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_07.c b/runtime/tests/jniarg/args_07.c index d0b2165a4b1..135ad9a4ee8 100644 --- a/runtime/tests/jniarg/args_07.c +++ b/runtime/tests/jniarg/args_07.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_08.c b/runtime/tests/jniarg/args_08.c index 94d4f9118fd..4090a0c92c0 100644 --- a/runtime/tests/jniarg/args_08.c +++ b/runtime/tests/jniarg/args_08.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_09.c b/runtime/tests/jniarg/args_09.c index 9a1831e0acc..06efa7b379a 100644 --- a/runtime/tests/jniarg/args_09.c +++ b/runtime/tests/jniarg/args_09.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/args_10.c b/runtime/tests/jniarg/args_10.c index 56b1567d328..0b755696f9b 100644 --- a/runtime/tests/jniarg/args_10.c +++ b/runtime/tests/jniarg/args_10.c @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/cdefs.c b/runtime/tests/jniarg/cdefs.c index 733ddfb0539..b2c34f38651 100644 --- a/runtime/tests/jniarg/cdefs.c +++ b/runtime/tests/jniarg/cdefs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jniargtests.h" diff --git a/runtime/tests/jniarg/exports.cmake b/runtime/tests/jniarg/exports.cmake index 8fdc6697554..e6a25b4671d 100644 --- a/runtime/tests/jniarg/exports.cmake +++ b/runtime/tests/jniarg/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_exports(jniargtests diff --git a/runtime/tests/jniarg/exports.xml b/runtime/tests/jniarg/exports.xml index cf3386cfd56..9ffe55fee49 100644 --- a/runtime/tests/jniarg/exports.xml +++ b/runtime/tests/jniarg/exports.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jniarg/jniargtests.h b/runtime/tests/jniarg/jniargtests.h index 5b6f77ba90c..c1bcd08a3be 100644 --- a/runtime/tests/jniarg/jniargtests.h +++ b/runtime/tests/jniarg/jniargtests.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jniarg/module.xml b/runtime/tests/jniarg/module.xml index 42d5f45ffdb..c3d080b42dd 100644 --- a/runtime/tests/jniarg/module.xml +++ b/runtime/tests/jniarg/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jniargsystemlinkage/module.xml b/runtime/tests/jniargsystemlinkage/module.xml index fc4e87c74f1..375a4504946 100644 --- a/runtime/tests/jniargsystemlinkage/module.xml +++ b/runtime/tests/jniargsystemlinkage/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jsig/CMakeLists.txt b/runtime/tests/jsig/CMakeLists.txt index 0e97839623f..bf8224794a6 100644 --- a/runtime/tests/jsig/CMakeLists.txt +++ b/runtime/tests/jsig/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(jsigjnitest main.c) diff --git a/runtime/tests/jsig/main.c b/runtime/tests/jsig/main.c index 09e4e721c62..8689101f8b5 100644 --- a/runtime/tests/jsig/main.c +++ b/runtime/tests/jsig/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(J9ZOS390) #include diff --git a/runtime/tests/jsig/module.xml b/runtime/tests/jsig/module.xml index 78a260a19f4..7b5fda7049f 100644 --- a/runtime/tests/jsig/module.xml +++ b/runtime/tests/jsig/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jvmtitests/CMakeLists.txt b/runtime/tests/jvmtitests/CMakeLists.txt index 197a252b0ab..727651dcf14 100644 --- a/runtime/tests/jvmtitests/CMakeLists.txt +++ b/runtime/tests/jvmtitests/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9vm_jvmtitest_includes INTERFACE) diff --git a/runtime/tests/jvmtitests/agent/CMakeLists.txt b/runtime/tests/jvmtitests/agent/CMakeLists.txt index 95ddb2cc057..29ddf79570c 100644 --- a/runtime/tests/jvmtitests/agent/CMakeLists.txt +++ b/runtime/tests/jvmtitests/agent/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/jvmtitests/agent/agent.c b/runtime/tests/jvmtitests/agent/agent.c index 20a340c2f86..f47cb09f59f 100644 --- a/runtime/tests/jvmtitests/agent/agent.c +++ b/runtime/tests/jvmtitests/agent/agent.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/agent/args.c b/runtime/tests/jvmtitests/agent/args.c index e98cd8a87fb..ba1cb3d0966 100644 --- a/runtime/tests/jvmtitests/agent/args.c +++ b/runtime/tests/jvmtitests/agent/args.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/agent/error.c b/runtime/tests/jvmtitests/agent/error.c index 4b973acceb4..8b9c9963587 100644 --- a/runtime/tests/jvmtitests/agent/error.c +++ b/runtime/tests/jvmtitests/agent/error.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/agent/help.c b/runtime/tests/jvmtitests/agent/help.c index 43f027d4d63..175dd8bbe72 100644 --- a/runtime/tests/jvmtitests/agent/help.c +++ b/runtime/tests/jvmtitests/agent/help.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/agent/message.c b/runtime/tests/jvmtitests/agent/message.c index 1f63e964c68..deca73c7bd8 100644 --- a/runtime/tests/jvmtitests/agent/message.c +++ b/runtime/tests/jvmtitests/agent/message.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/agent/module.xml b/runtime/tests/jvmtitests/agent/module.xml index da419625809..3f748155553 100644 --- a/runtime/tests/jvmtitests/agent/module.xml +++ b/runtime/tests/jvmtitests/agent/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jvmtitests/agent/strings.c b/runtime/tests/jvmtitests/agent/strings.c index 9df2a89289d..e4589c096bd 100644 --- a/runtime/tests/jvmtitests/agent/strings.c +++ b/runtime/tests/jvmtitests/agent/strings.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/agent/tests.c b/runtime/tests/jvmtitests/agent/tests.c index 2d9c4fa9407..a8ba323ec58 100644 --- a/runtime/tests/jvmtitests/agent/tests.c +++ b/runtime/tests/jvmtitests/agent/tests.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/agent/thread.c b/runtime/tests/jvmtitests/agent/thread.c index ee537a05641..0cc499dfc89 100644 --- a/runtime/tests/jvmtitests/agent/thread.c +++ b/runtime/tests/jvmtitests/agent/thread.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/agent/util.c b/runtime/tests/jvmtitests/agent/util.c index 1e0b78c51aa..3dab6126fb2 100644 --- a/runtime/tests/jvmtitests/agent/util.c +++ b/runtime/tests/jvmtitests/agent/util.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) || defined(WIN64) diff --git a/runtime/tests/jvmtitests/agent/version.c b/runtime/tests/jvmtitests/agent/version.c index 49e9af1e939..42838b60235 100644 --- a/runtime/tests/jvmtitests/agent/version.c +++ b/runtime/tests/jvmtitests/agent/version.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/exports.cmake b/runtime/tests/jvmtitests/exports.cmake index 19a16fd4153..c5343cf65c6 100644 --- a/runtime/tests/jvmtitests/exports.cmake +++ b/runtime/tests/jvmtitests/exports.cmake @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_exports(jvmtitest diff --git a/runtime/tests/jvmtitests/fakeref.c b/runtime/tests/jvmtitests/fakeref.c index df2a710cb70..d8831a4bf90 100644 --- a/runtime/tests/jvmtitests/fakeref.c +++ b/runtime/tests/jvmtitests/fakeref.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti.h" diff --git a/runtime/tests/jvmtitests/include/jvmti_test.h b/runtime/tests/jvmtitests/include/jvmti_test.h index 39df12fc769..b336d78062d 100644 --- a/runtime/tests/jvmtitests/include/jvmti_test.h +++ b/runtime/tests/jvmtitests/include/jvmti_test.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JVMTI_TEST_H_ #define JVMTI_TEST_H_ diff --git a/runtime/tests/jvmtitests/include/module.xml b/runtime/tests/jvmtitests/include/module.xml index 9322e95d334..3bf078db038 100644 --- a/runtime/tests/jvmtitests/include/module.xml +++ b/runtime/tests/jvmtitests/include/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jvmtitests/module.xml b/runtime/tests/jvmtitests/module.xml index a57d84c608c..f3ac0b527c9 100644 --- a/runtime/tests/jvmtitests/module.xml +++ b/runtime/tests/jvmtitests/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/jvmtitests/src/CMakeLists.txt b/runtime/tests/jvmtitests/src/CMakeLists.txt index e635fbc3791..844c6e0b298 100644 --- a/runtime/tests/jvmtitests/src/CMakeLists.txt +++ b/runtime/tests/jvmtitests/src/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.c index 2391d5853d7..eab0f1a09cc 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.c index 2ed18b7e381..7f328eeaf7d 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ibmjvmti.h" #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.c index d1b687a8597..ffe244d3116 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ibmjvmti.h" #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.c index e6879e36f14..c833f60608d 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ibmjvmti.h" #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.c index 0b3db8384c7..dafb9c0f445 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ibmjvmti.h" #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.c index 2af162f4152..25eeede2ce3 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ibmjvmti.h" #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.c index a043d664e0f..7c2088a901c 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ibmjvmti.h" #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.c index e5c4c7935b1..7e21c7c3d94 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.c index cb4f1235c87..04206a98679 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.c index fc0339ba1c3..483c5b4caf6 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.c index 94a141b72bb..a791fda1805 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.c index bca082783e1..1dd6e942961 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.c index 481dccda65c..2667b2b671b 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.c index f858523496e..c1c64ca9314 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.c index 3b34fd52b8c..c47a49e1df4 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvmti_test.h" diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.c index 89f021c157e..6d196f355c1 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.c index d09249511ab..d5baf72f8f0 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.c index 581ce30c901..6d962127565 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.c index 50b7f542c0f..28426089e0c 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.c index 8572f5b22f2..33a7723a9f2 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.c index 034b947ffd5..bf22e85fc7d 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.c index e56c8e1ad10..9fb16c3b1ea 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.c index 3cea818966f..6bec83fa0f1 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr.h b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr.h index 2a4fa31b36c..2cbe9f197cb 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr.h +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef __FR_H #define __FR_H diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.c index 1975d393749..f176758432f 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.c index 11687042a4c..48945f59fa4 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.c index 43a12c98c8e..42eb48bd930 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.c index cad56b0a735..b7218e64363 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/tag_manager.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/tag_manager.c index 1fab04d589c..359f261f03f 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/tag_manager.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/tag_manager.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.c index f802ef4f42d..9366d7d97ba 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.h b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.h index e8ac848a55a..f533f4c61a2 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.h +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JVMTI_TEST_FORCE_EARLY_RETURN_H_ #define JVMTI_TEST_FORCE_EARLY_RETURN_H_ diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.c index e9d787cbd0f..b5e965633fd 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.c index 625178eacf8..7bcee16feec 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.c index a199755c6b8..9a47000ef3c 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.c index c48b34c3a79..691ce8e7027 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.c index 1e29b0af817..2abe96082d3 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp001.c index d287eddbdb1..d7ab318c5d6 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp_bcdump.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp_bcdump.c index c30527fb867..fa05962e184 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp_bcdump.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/gcp_bcdump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if 0 diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.c index 13f54e4cd09..c81ffc20277 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.c index b11484e7486..a95eb0376a6 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.c index 6fa6b5cbe73..691594af0e3 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.c index b8915d61088..43b48ba413e 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.c index 28f28948e70..382ff767853 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.c index 3509b6f8e4c..50e1d09fa7f 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.c index 9e43bc098d2..3901dbb513d 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.c index 6e33dddf061..97f83835d88 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.c index de888041bec..4dda5de91d0 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.c index 413698bb6c6..53056db260a 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.c index df84e4789cf..cae47288c1e 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.c index 162bfde93a3..5dfd2e9444a 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.c index eda70162d23..cc684472ac1 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.c index 7559120f044..76d5d1b4f5c 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.c index 86393014416..212117ea580 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.c index a67b42c3466..e633e3014de 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.c index 80d0c05b417..0f3bd1ae066 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.c index be7fe27b2f4..04a5d47689b 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.c index 8cb8dd008f4..32f07485c6b 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.c index 0519514a852..88429427e24 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.c index 389285250f6..ebce1a28b85 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.c index 686ebd99a55..677338d7b3e 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.c index 7440e0ded82..a6ab787c96f 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.c index 2468edd55a9..17de5a60900 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.c index 45e693c2beb..84d039963af 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.c index 957bfc2fca6..95b371eba55 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.c index f5399247c2f..785639b4f81 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/modularityTests/mt001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/modularityTests/mt001.c index 29b1d6c9674..9edfca5f75a 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/modularityTests/mt001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/modularityTests/mt001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.c index 1c4e6c3a8b1..7df3b354138 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.c index f97f7610e40..b53ea074ebf 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.c index 8f33f836943..eadb9c3527f 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.c index 6bf6c8e1a18..e42cda69824 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.c index e1663e08904..73e5cea7f28 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.c index a51dbd8f1c5..1357796c924 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.c index 98eda660967..42e4ab7cbd9 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.c index 686031032c7..1e1532c1cf5 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.c index 2ca1af8a020..385d9684cca 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.c index a2459a60ef5..808dec4b734 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.c index be71c3d4386..496cb66d5eb 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.c index 7eea52ef73c..937b002b2a0 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.c index 57e0f354cec..2f301e38ddd 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.c index 3b418d16440..977d20e4263 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.c index e575c4a1bb2..619f57d11fc 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.c index e44e2aecdbf..a6007ed97f4 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.c index edeeb0ba295..f2eaeb350f0 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.c index 4b40fa50123..bdbf4659e7a 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.c index 8b75aaa7a37..56f49020aba 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.c index d54e0154ee7..0fd86ffa3d6 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.c index 3b712c83751..f5ce5075330 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.c index 2e46c4a72c7..82bf241f98e 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.c index 82f6c7af6d1..c690fe57bf3 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.c index 719ee884214..f3b6e545d0f 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rtc003.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rtc003.c index d854bc78bc5..189f6e6ebcc 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rtc003.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rtc003.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.c index 14b0d81fa18..cf4f47846ee 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.c index c8ca0fcfd02..046a24cfbf8 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.c index 4ed103a593f..63bb2538374 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.c index c16af7ef68d..5d3de5148c9 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.c index c6aa82262a3..37105ebca5b 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.c index 6e134c658e8..6dfdf7b3770 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationCapableAgent/rca001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationCapableAgent/rca001.c index fc4a4689e9e..9c14c5b2d62 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationCapableAgent/rca001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationCapableAgent/rca001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationIncapableAgent/ria001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationIncapableAgent/ria001.c index 99006f809d4..0f42b6ca82d 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationIncapableAgent/ria001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/retransformationIncapableAgent/ria001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.c index fec7133e537..7d11825bd5e 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.c index a494dd9e8e4..6113b181590 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.c index 99fb60e08db..8ef336a4f5e 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c index 5f315c4e441..d9c781c1223 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.c index 88affe4a635..442c711d8eb 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c index 93d35bdd08c..be28c4677a1 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.c b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.c index 95bef2d0969..1a94af8fccd 100644 --- a/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.c +++ b/runtime/tests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/jvmtitests/src/module.xml b/runtime/tests/jvmtitests/src/module.xml index b1e57575c9b..40d5e5f1969 100644 --- a/runtime/tests/jvmtitests/src/module.xml +++ b/runtime/tests/jvmtitests/src/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/lazyclassload/CMakeLists.txt b/runtime/tests/lazyclassload/CMakeLists.txt index 27404fa9e43..7a1d1085d19 100644 --- a/runtime/tests/lazyclassload/CMakeLists.txt +++ b/runtime/tests/lazyclassload/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9lazyClassLoad SHARED diff --git a/runtime/tests/lazyclassload/lazycloassload.c b/runtime/tests/lazyclassload/lazycloassload.c index 28228823457..796a4b1e5ac 100644 --- a/runtime/tests/lazyclassload/lazycloassload.c +++ b/runtime/tests/lazyclassload/lazycloassload.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/lazyclassload/module.xml b/runtime/tests/lazyclassload/module.xml index 011f3f1acfb..508a9b2c07e 100644 --- a/runtime/tests/lazyclassload/module.xml +++ b/runtime/tests/lazyclassload/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/loadLibraryTest/CMakeLists.txt b/runtime/tests/loadLibraryTest/CMakeLists.txt index cac053118f2..aff92eb3087 100644 --- a/runtime/tests/loadLibraryTest/CMakeLists.txt +++ b/runtime/tests/loadLibraryTest/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(loadLibraryTest SHARED legacyLibraryName.c) diff --git a/runtime/tests/loadLibraryTest/legacyLibraryName.c b/runtime/tests/loadLibraryTest/legacyLibraryName.c index 18a02f74c89..ec85ab1a6be 100644 --- a/runtime/tests/loadLibraryTest/legacyLibraryName.c +++ b/runtime/tests/loadLibraryTest/legacyLibraryName.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/loadLibraryTest/module.xml b/runtime/tests/loadLibraryTest/module.xml index 892b890587c..e54fec74015 100644 --- a/runtime/tests/loadLibraryTest/module.xml +++ b/runtime/tests/loadLibraryTest/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/port/CMakeLists.txt b/runtime/tests/port/CMakeLists.txt index d04504294f6..280cd6647b8 100644 --- a/runtime/tests/port/CMakeLists.txt +++ b/runtime/tests/port/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/port/j9cudaTest.c b/runtime/tests/port/j9cudaTest.c index 8240f557706..cdf7688f76a 100644 --- a/runtime/tests/port/j9cudaTest.c +++ b/runtime/tests/port/j9cudaTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/j9cuda_ptx.h b/runtime/tests/port/j9cuda_ptx.h index 058f40fe726..c4dbf7b689b 100644 --- a/runtime/tests/port/j9cuda_ptx.h +++ b/runtime/tests/port/j9cuda_ptx.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef J9CUDA_PTX_H_ diff --git a/runtime/tests/port/j9dumpTest.c b/runtime/tests/port/j9dumpTest.c index 2cb308b8a3b..12f873e2778 100644 --- a/runtime/tests/port/j9dumpTest.c +++ b/runtime/tests/port/j9dumpTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/tests/port/j9errorTest.c b/runtime/tests/port/j9errorTest.c index ddd32ebd5c3..4dafa2d7bb9 100644 --- a/runtime/tests/port/j9errorTest.c +++ b/runtime/tests/port/j9errorTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9fileTest.c b/runtime/tests/port/j9fileTest.c index 5f4f0d2047a..5f971c4cd03 100644 --- a/runtime/tests/port/j9fileTest.c +++ b/runtime/tests/port/j9fileTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/j9fileTest.h b/runtime/tests/port/j9fileTest.h index 3e448da0f41..521e8f4014a 100644 --- a/runtime/tests/port/j9fileTest.h +++ b/runtime/tests/port/j9fileTest.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9FILETEST_H_INCLUDED) #define J9FILETEST_H_INCLUDED diff --git a/runtime/tests/port/j9heapTest.c b/runtime/tests/port/j9heapTest.c index 545a4942b51..f683073fa42 100644 --- a/runtime/tests/port/j9heapTest.c +++ b/runtime/tests/port/j9heapTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9hypervisorTest.c b/runtime/tests/port/j9hypervisorTest.c index 8537f60545d..fd4cced4aa2 100644 --- a/runtime/tests/port/j9hypervisorTest.c +++ b/runtime/tests/port/j9hypervisorTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/tests/port/j9memTest.c b/runtime/tests/port/j9memTest.c index 6476fb8b1fb..e292d8e3fde 100644 --- a/runtime/tests/port/j9memTest.c +++ b/runtime/tests/port/j9memTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9mmapTest.c b/runtime/tests/port/j9mmapTest.c index fea8950a721..18581dce840 100644 --- a/runtime/tests/port/j9mmapTest.c +++ b/runtime/tests/port/j9mmapTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9nlsTest.c b/runtime/tests/port/j9nlsTest.c index 3e253a7b8ee..15713b52903 100644 --- a/runtime/tests/port/j9nlsTest.c +++ b/runtime/tests/port/j9nlsTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/j9portTest.c b/runtime/tests/port/j9portTest.c index 912ce580f04..4afa5d1d8b6 100644 --- a/runtime/tests/port/j9portTest.c +++ b/runtime/tests/port/j9portTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9processTest.c b/runtime/tests/port/j9processTest.c index 74dea08858d..6245019434b 100644 --- a/runtime/tests/port/j9processTest.c +++ b/runtime/tests/port/j9processTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/j9riTest.c b/runtime/tests/port/j9riTest.c index c8e15acda7e..ca430ba76e3 100644 --- a/runtime/tests/port/j9riTest.c +++ b/runtime/tests/port/j9riTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9shsemTest.c b/runtime/tests/port/j9shsemTest.c index 282a48f23c0..99f7a5d7bb0 100644 --- a/runtime/tests/port/j9shsemTest.c +++ b/runtime/tests/port/j9shsemTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "testHelpers.h" diff --git a/runtime/tests/port/j9shsem_deprecatedTest.c b/runtime/tests/port/j9shsem_deprecatedTest.c index 882a5cdf5c3..75f48d0ac58 100644 --- a/runtime/tests/port/j9shsem_deprecatedTest.c +++ b/runtime/tests/port/j9shsem_deprecatedTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "testHelpers.h" diff --git a/runtime/tests/port/j9slTest.c b/runtime/tests/port/j9slTest.c index 863409b9ba3..8bee958c48b 100644 --- a/runtime/tests/port/j9slTest.c +++ b/runtime/tests/port/j9slTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/j9sockTest.c b/runtime/tests/port/j9sockTest.c index 87d6d40bdb9..e8d436e1bce 100644 --- a/runtime/tests/port/j9sockTest.c +++ b/runtime/tests/port/j9sockTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9strTest.c b/runtime/tests/port/j9strTest.c index 05f4cef3267..405524e97f3 100644 --- a/runtime/tests/port/j9strTest.c +++ b/runtime/tests/port/j9strTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9timeTest.c b/runtime/tests/port/j9timeTest.c index 06b0a2a0310..fefbf28fa7f 100644 --- a/runtime/tests/port/j9timeTest.c +++ b/runtime/tests/port/j9timeTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9ttyExtendedTest.c b/runtime/tests/port/j9ttyExtendedTest.c index 32f0f3696f2..81f884517d2 100644 --- a/runtime/tests/port/j9ttyExtendedTest.c +++ b/runtime/tests/port/j9ttyExtendedTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/j9ttyTest.c b/runtime/tests/port/j9ttyTest.c index 8a4d5e8c5de..81ba225eb58 100644 --- a/runtime/tests/port/j9ttyTest.c +++ b/runtime/tests/port/j9ttyTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/j9vmemTest.c b/runtime/tests/port/j9vmemTest.c index 16196f4bb6a..7496bb3d353 100644 --- a/runtime/tests/port/j9vmemTest.c +++ b/runtime/tests/port/j9vmemTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/port/main.c b/runtime/tests/port/main.c index 0a70d892829..0fc90de713e 100644 --- a/runtime/tests/port/main.c +++ b/runtime/tests/port/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/module.xml b/runtime/tests/port/module.xml index 59fbf583853..33745040cff 100644 --- a/runtime/tests/port/module.xml +++ b/runtime/tests/port/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/port/shmem.c b/runtime/tests/port/shmem.c index e8f7ce2d1bb..63667a3d1da 100644 --- a/runtime/tests/port/shmem.c +++ b/runtime/tests/port/shmem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/shmem.h b/runtime/tests/port/shmem.h index 6471804839a..9db1ae943bd 100644 --- a/runtime/tests/port/shmem.h +++ b/runtime/tests/port/shmem.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/port/si.c b/runtime/tests/port/si.c index 10d87133d0b..72cfd468445 100644 --- a/runtime/tests/port/si.c +++ b/runtime/tests/port/si.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/tests/port/si_numcpusTest.c b/runtime/tests/port/si_numcpusTest.c index a2927c48e04..d74e78ddfd9 100644 --- a/runtime/tests/port/si_numcpusTest.c +++ b/runtime/tests/port/si_numcpusTest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/tests/port/testHelpers.c b/runtime/tests/port/testHelpers.c index e1205c70c3f..16b298d206b 100644 --- a/runtime/tests/port/testHelpers.c +++ b/runtime/tests/port/testHelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/port/testHelpers.h b/runtime/tests/port/testHelpers.h index 4da219a9b7b..61302156572 100644 --- a/runtime/tests/port/testHelpers.h +++ b/runtime/tests/port/testHelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef TEST_HELPERS_H_INCLUDED diff --git a/runtime/tests/port/testProcessHelpers.c b/runtime/tests/port/testProcessHelpers.c index 7055e784d98..5f44aac4b2e 100644 --- a/runtime/tests/port/testProcessHelpers.c +++ b/runtime/tests/port/testProcessHelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* These headers are required for ChildrenTest */ #if defined(WIN32) diff --git a/runtime/tests/port/testProcessHelpers.h b/runtime/tests/port/testProcessHelpers.h index 354363c6c99..22c2e1f1739 100644 --- a/runtime/tests/port/testProcessHelpers.h +++ b/runtime/tests/port/testProcessHelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(TESTPROCESSHELPER_H_INCLUDED) #define TESTPROCESSHELPER_H_INCLUDED diff --git a/runtime/tests/props/CMakeLists.txt b/runtime/tests/props/CMakeLists.txt index d8c27323ad4..1bda1ed6c5e 100644 --- a/runtime/tests/props/CMakeLists.txt +++ b/runtime/tests/props/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(propstest diff --git a/runtime/tests/props/main.c b/runtime/tests/props/main.c index ff6981924b7..cf2b26e6894 100644 --- a/runtime/tests/props/main.c +++ b/runtime/tests/props/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/tests/props/module.xml b/runtime/tests/props/module.xml index a5457dc9597..483fb1fdc58 100644 --- a/runtime/tests/props/module.xml +++ b/runtime/tests/props/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/props/suite.c b/runtime/tests/props/suite.c index 36c50a25547..61061bbb87b 100644 --- a/runtime/tests/props/suite.c +++ b/runtime/tests/props/suite.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CuTest.h" #include diff --git a/runtime/tests/redirector/CMakeLists.txt b/runtime/tests/redirector/CMakeLists.txt index 82aa01da059..151a8ff9139 100644 --- a/runtime/tests/redirector/CMakeLists.txt +++ b/runtime/tests/redirector/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_subdirectory(genericlauncher) diff --git a/runtime/tests/redirector/genericlauncher/CMakeLists.txt b/runtime/tests/redirector/genericlauncher/CMakeLists.txt index b52dced7cfb..6f144f5ba78 100644 --- a/runtime/tests/redirector/genericlauncher/CMakeLists.txt +++ b/runtime/tests/redirector/genericlauncher/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(glaunch genlauncher.c) diff --git a/runtime/tests/redirector/genericlauncher/genlauncher.c b/runtime/tests/redirector/genericlauncher/genlauncher.c index c154878a44a..5dc96824ca4 100644 --- a/runtime/tests/redirector/genericlauncher/genlauncher.c +++ b/runtime/tests/redirector/genericlauncher/genlauncher.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/redirector/genericlauncher/module.xml b/runtime/tests/redirector/genericlauncher/module.xml index 9504d5111bd..be9bcc02d0d 100644 --- a/runtime/tests/redirector/genericlauncher/module.xml +++ b/runtime/tests/redirector/genericlauncher/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/jep178/CMakeLists.txt b/runtime/tests/redirector/jep178/CMakeLists.txt index c8ca7817801..287f65d80b5 100644 --- a/runtime/tests/redirector/jep178/CMakeLists.txt +++ b/runtime/tests/redirector/jep178/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_subdirectory(testjvmtiA) diff --git a/runtime/tests/redirector/jep178/README.txt b/runtime/tests/redirector/jep178/README.txt index 31007189716..ca77fd281ed 100644 --- a/runtime/tests/redirector/jep178/README.txt +++ b/runtime/tests/redirector/jep178/README.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # Test statically linking JNI Libraries [JEP 178] diff --git a/runtime/tests/redirector/jep178/module.xml b/runtime/tests/redirector/jep178/module.xml index 9c8853e836b..b9e740358b4 100644 --- a/runtime/tests/redirector/jep178/module.xml +++ b/runtime/tests/redirector/jep178/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/jep178/static_agents.c b/runtime/tests/redirector/jep178/static_agents.c index 207e5d2161b..d0ad5d4a4a4 100644 --- a/runtime/tests/redirector/jep178/static_agents.c +++ b/runtime/tests/redirector/jep178/static_agents.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/static_libraries.c b/runtime/tests/redirector/jep178/static_libraries.c index aba48867c17..29e5f148246 100644 --- a/runtime/tests/redirector/jep178/static_libraries.c +++ b/runtime/tests/redirector/jep178/static_libraries.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/testjep178.c b/runtime/tests/redirector/jep178/testjep178.c index 7e642231318..32a2ffcaf89 100644 --- a/runtime/tests/redirector/jep178/testjep178.c +++ b/runtime/tests/redirector/jep178/testjep178.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/testjep178.h b/runtime/tests/redirector/jep178/testjep178.h index ee1acd9a997..f70a68ef3f7 100644 --- a/runtime/tests/redirector/jep178/testjep178.h +++ b/runtime/tests/redirector/jep178/testjep178.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/testjvmtiA/CMakeLists.txt b/runtime/tests/redirector/jep178/testjvmtiA/CMakeLists.txt index b2a04ab398b..80d2027ac1e 100644 --- a/runtime/tests/redirector/jep178/testjvmtiA/CMakeLists.txt +++ b/runtime/tests/redirector/jep178/testjvmtiA/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(testjvmtiA SHARED testjvmtiA.c) diff --git a/runtime/tests/redirector/jep178/testjvmtiA/module.xml b/runtime/tests/redirector/jep178/testjvmtiA/module.xml index 688588acac3..5575a60e78e 100644 --- a/runtime/tests/redirector/jep178/testjvmtiA/module.xml +++ b/runtime/tests/redirector/jep178/testjvmtiA/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/jep178/testjvmtiA/testjvmtiA.c b/runtime/tests/redirector/jep178/testjvmtiA/testjvmtiA.c index 8406bac0d53..77348b20486 100644 --- a/runtime/tests/redirector/jep178/testjvmtiA/testjvmtiA.c +++ b/runtime/tests/redirector/jep178/testjvmtiA/testjvmtiA.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/testjvmtiB/CMakeLists.txt b/runtime/tests/redirector/jep178/testjvmtiB/CMakeLists.txt index 799afd1bda8..75e2cbf7728 100644 --- a/runtime/tests/redirector/jep178/testjvmtiB/CMakeLists.txt +++ b/runtime/tests/redirector/jep178/testjvmtiB/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(testjvmtiB SHARED testjvmtiB.c) diff --git a/runtime/tests/redirector/jep178/testjvmtiB/module.xml b/runtime/tests/redirector/jep178/testjvmtiB/module.xml index d3efb458d66..cf5fb4ca1bb 100644 --- a/runtime/tests/redirector/jep178/testjvmtiB/module.xml +++ b/runtime/tests/redirector/jep178/testjvmtiB/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/jep178/testjvmtiB/testjvmtiB.c b/runtime/tests/redirector/jep178/testjvmtiB/testjvmtiB.c index 27706da99a2..be07fbf1a25 100644 --- a/runtime/tests/redirector/jep178/testjvmtiB/testjvmtiB.c +++ b/runtime/tests/redirector/jep178/testjvmtiB/testjvmtiB.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/testlibA/CMakeLists.txt b/runtime/tests/redirector/jep178/testlibA/CMakeLists.txt index 137b6de2f5b..65e04c51e1d 100644 --- a/runtime/tests/redirector/jep178/testlibA/CMakeLists.txt +++ b/runtime/tests/redirector/jep178/testlibA/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(testlibA SHARED testlibA.c) diff --git a/runtime/tests/redirector/jep178/testlibA/module.xml b/runtime/tests/redirector/jep178/testlibA/module.xml index dea6aee6804..d87fda7d215 100644 --- a/runtime/tests/redirector/jep178/testlibA/module.xml +++ b/runtime/tests/redirector/jep178/testlibA/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/jep178/testlibA/testlibA.c b/runtime/tests/redirector/jep178/testlibA/testlibA.c index dfa72bae6a3..53d17a3dbff 100644 --- a/runtime/tests/redirector/jep178/testlibA/testlibA.c +++ b/runtime/tests/redirector/jep178/testlibA/testlibA.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/jep178/testlibB/CMakeLists.txt b/runtime/tests/redirector/jep178/testlibB/CMakeLists.txt index 0841ad48917..b48f27455c4 100644 --- a/runtime/tests/redirector/jep178/testlibB/CMakeLists.txt +++ b/runtime/tests/redirector/jep178/testlibB/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(testlibB SHARED testlibB.c) diff --git a/runtime/tests/redirector/jep178/testlibB/module.xml b/runtime/tests/redirector/jep178/testlibB/module.xml index 5ff7a7d7d80..e397153a337 100644 --- a/runtime/tests/redirector/jep178/testlibB/module.xml +++ b/runtime/tests/redirector/jep178/testlibB/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/jep178/testlibB/testlibB.c b/runtime/tests/redirector/jep178/testlibB/testlibB.c index 254198a23a6..8a70626c802 100644 --- a/runtime/tests/redirector/jep178/testlibB/testlibB.c +++ b/runtime/tests/redirector/jep178/testlibB/testlibB.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/redirector/nativevmargs/CMakeLists.txt b/runtime/tests/redirector/nativevmargs/CMakeLists.txt index 486e7e1d648..ed060d92487 100644 --- a/runtime/tests/redirector/nativevmargs/CMakeLists.txt +++ b/runtime/tests/redirector/nativevmargs/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(nativevmargs testnativevmargs.c) diff --git a/runtime/tests/redirector/nativevmargs/module.xml b/runtime/tests/redirector/nativevmargs/module.xml index 286c81778ff..8794b0f9136 100644 --- a/runtime/tests/redirector/nativevmargs/module.xml +++ b/runtime/tests/redirector/nativevmargs/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/redirector/nativevmargs/testnativevmargs.c b/runtime/tests/redirector/nativevmargs/testnativevmargs.c index 0517d2c6693..91e7be72ea9 100644 --- a/runtime/tests/redirector/nativevmargs/testnativevmargs.c +++ b/runtime/tests/redirector/nativevmargs/testnativevmargs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/tests/shared/AOTDataMinMaxTest.cpp b/runtime/tests/shared/AOTDataMinMaxTest.cpp index 969203c7a06..c7dfc09f32a 100644 --- a/runtime/tests/shared/AOTDataMinMaxTest.cpp +++ b/runtime/tests/shared/AOTDataMinMaxTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/AttachedDataMinMaxTest.cpp b/runtime/tests/shared/AttachedDataMinMaxTest.cpp index c8660b384e8..7e62df9135f 100644 --- a/runtime/tests/shared/AttachedDataMinMaxTest.cpp +++ b/runtime/tests/shared/AttachedDataMinMaxTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/AttachedDataTest.cpp b/runtime/tests/shared/AttachedDataTest.cpp index d347dddb872..939f141e046 100644 --- a/runtime/tests/shared/AttachedDataTest.cpp +++ b/runtime/tests/shared/AttachedDataTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/ByteDataTest.cpp b/runtime/tests/shared/ByteDataTest.cpp index b1f9e0e26fd..9574d566aa9 100644 --- a/runtime/tests/shared/ByteDataTest.cpp +++ b/runtime/tests/shared/ByteDataTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CacheMap.hpp" #include "CompositeCache.hpp" diff --git a/runtime/tests/shared/CMakeLists.txt b/runtime/tests/shared/CMakeLists.txt index a3106baa987..1f69ab696c6 100644 --- a/runtime/tests/shared/CMakeLists.txt +++ b/runtime/tests/shared/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(shrtest diff --git a/runtime/tests/shared/CacheDirPerm.cpp b/runtime/tests/shared/CacheDirPerm.cpp index 3ba439e52fa..df8aa9300ea 100644 --- a/runtime/tests/shared/CacheDirPerm.cpp +++ b/runtime/tests/shared/CacheDirPerm.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(WIN32) extern "C" { diff --git a/runtime/tests/shared/CacheFullTests.cpp b/runtime/tests/shared/CacheFullTests.cpp index 55ac04824f5..e96374d93fb 100644 --- a/runtime/tests/shared/CacheFullTests.cpp +++ b/runtime/tests/shared/CacheFullTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/CacheMapTest.cpp b/runtime/tests/shared/CacheMapTest.cpp index e1192d34508..de65965c4b9 100644 --- a/runtime/tests/shared/CacheMapTest.cpp +++ b/runtime/tests/shared/CacheMapTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CacheMap.hpp" diff --git a/runtime/tests/shared/ClassDebugDataTests.cpp b/runtime/tests/shared/ClassDebugDataTests.cpp index db74d69eec2..c1b2c777616 100644 --- a/runtime/tests/shared/ClassDebugDataTests.cpp +++ b/runtime/tests/shared/ClassDebugDataTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ClassDebugDataTests.h" #include "ClassDebugDataProvider.hpp" diff --git a/runtime/tests/shared/ClassDebugDataTests.h b/runtime/tests/shared/ClassDebugDataTests.h index 84d20c2b81e..168e1ef408e 100644 --- a/runtime/tests/shared/ClassDebugDataTests.h +++ b/runtime/tests/shared/ClassDebugDataTests.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_CLASS_DEBUG_DATA_TESTS_H_INCLUDED) diff --git a/runtime/tests/shared/ClasspathCacheTest.cpp b/runtime/tests/shared/ClasspathCacheTest.cpp index 873ef47bad3..4bb41716732 100644 --- a/runtime/tests/shared/ClasspathCacheTest.cpp +++ b/runtime/tests/shared/ClasspathCacheTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "classpathcache.h" diff --git a/runtime/tests/shared/ClasspathItemTest.cpp b/runtime/tests/shared/ClasspathItemTest.cpp index 13f4487c173..73ef73d0fcb 100644 --- a/runtime/tests/shared/ClasspathItemTest.cpp +++ b/runtime/tests/shared/ClasspathItemTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ClasspathItem.hpp" diff --git a/runtime/tests/shared/CompiledMethodTest.cpp b/runtime/tests/shared/CompiledMethodTest.cpp index b08e6a82e83..5a0ba66c6ea 100644 --- a/runtime/tests/shared/CompiledMethodTest.cpp +++ b/runtime/tests/shared/CompiledMethodTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Includes */ diff --git a/runtime/tests/shared/CompositeCacheSizesTests.cpp b/runtime/tests/shared/CompositeCacheSizesTests.cpp index 97e190d6716..306836aeca9 100644 --- a/runtime/tests/shared/CompositeCacheSizesTests.cpp +++ b/runtime/tests/shared/CompositeCacheSizesTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/runtime/tests/shared/CompositeCacheSizesTests.hpp b/runtime/tests/shared/CompositeCacheSizesTests.hpp index 4c71432b46c..8ae54e43b16 100644 --- a/runtime/tests/shared/CompositeCacheSizesTests.hpp +++ b/runtime/tests/shared/CompositeCacheSizesTests.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_COMPOSITE_CACHE_SIZES_TESTS_H_INCLUDED) diff --git a/runtime/tests/shared/CompositeCacheTest.cpp b/runtime/tests/shared/CompositeCacheTest.cpp index 969fe4d172d..5a4dfa9db70 100644 --- a/runtime/tests/shared/CompositeCacheTest.cpp +++ b/runtime/tests/shared/CompositeCacheTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "CompositeCacheImpl.hpp" diff --git a/runtime/tests/shared/CorruptCacheTest.cpp b/runtime/tests/shared/CorruptCacheTest.cpp index 3b88b6d2932..d2d51133daf 100644 --- a/runtime/tests/shared/CorruptCacheTest.cpp +++ b/runtime/tests/shared/CorruptCacheTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/runtime/tests/shared/OSCacheTest.cpp b/runtime/tests/shared/OSCacheTest.cpp index 556fde4815f..02ca9c9b0ce 100644 --- a/runtime/tests/shared/OSCacheTest.cpp +++ b/runtime/tests/shared/OSCacheTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OSCacheTest.hpp" diff --git a/runtime/tests/shared/OSCacheTest.hpp b/runtime/tests/shared/OSCacheTest.hpp index c602fed3c43..b5d9e3778fb 100644 --- a/runtime/tests/shared/OSCacheTest.hpp +++ b/runtime/tests/shared/OSCacheTest.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHETEST_HPP_INCLUDED) #define OSCACHETEST_HPP_INCLUDED diff --git a/runtime/tests/shared/OSCacheTestMisc.cpp b/runtime/tests/shared/OSCacheTestMisc.cpp index d373c8f345a..576024111aa 100644 --- a/runtime/tests/shared/OSCacheTestMisc.cpp +++ b/runtime/tests/shared/OSCacheTestMisc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OSCacheTestMisc.hpp" diff --git a/runtime/tests/shared/OSCacheTestMisc.hpp b/runtime/tests/shared/OSCacheTestMisc.hpp index 2aad3aa718c..253c0cac01b 100644 --- a/runtime/tests/shared/OSCacheTestMisc.hpp +++ b/runtime/tests/shared/OSCacheTestMisc.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHETESTMISC_HPP_INCLUDED) #define OSCACHETESTMISC_HPP_INCLUDED diff --git a/runtime/tests/shared/OSCacheTestMmap.cpp b/runtime/tests/shared/OSCacheTestMmap.cpp index 17abfda2e68..ee7ae5de0cc 100644 --- a/runtime/tests/shared/OSCacheTestMmap.cpp +++ b/runtime/tests/shared/OSCacheTestMmap.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OSCacheTestMmap.hpp" diff --git a/runtime/tests/shared/OSCacheTestMmap.hpp b/runtime/tests/shared/OSCacheTestMmap.hpp index 0a52d1e326f..0a344eb65bd 100644 --- a/runtime/tests/shared/OSCacheTestMmap.hpp +++ b/runtime/tests/shared/OSCacheTestMmap.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHETESTMMAP_HPP_INCLUDED) #define OSCACHETESTMMAP_HPP_INCLUDED diff --git a/runtime/tests/shared/OSCacheTestSysv.cpp b/runtime/tests/shared/OSCacheTestSysv.cpp index 072da0b332e..e1879278b9f 100644 --- a/runtime/tests/shared/OSCacheTestSysv.cpp +++ b/runtime/tests/shared/OSCacheTestSysv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OSCacheTestSysv.hpp" diff --git a/runtime/tests/shared/OSCacheTestSysv.hpp b/runtime/tests/shared/OSCacheTestSysv.hpp index 9cfb873788f..8fbeff81bef 100644 --- a/runtime/tests/shared/OSCacheTestSysv.hpp +++ b/runtime/tests/shared/OSCacheTestSysv.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OSCACHETESTSYSV_HPP_INCLUDED) #define OSCACHETESTSYSV_HPP_INCLUDED diff --git a/runtime/tests/shared/OpenCacheHelper.cpp b/runtime/tests/shared/OpenCacheHelper.cpp index 220ae697909..4e9c83ef569 100644 --- a/runtime/tests/shared/OpenCacheHelper.cpp +++ b/runtime/tests/shared/OpenCacheHelper.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OpenCacheHelper.h" diff --git a/runtime/tests/shared/OpenCacheHelper.h b/runtime/tests/shared/OpenCacheHelper.h index 51a9c5e4dc0..244726b671a 100644 --- a/runtime/tests/shared/OpenCacheHelper.h +++ b/runtime/tests/shared/OpenCacheHelper.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(OPENCACHEHELPER_H_INCLUDED) diff --git a/runtime/tests/shared/ProcessHelper.cpp b/runtime/tests/shared/ProcessHelper.cpp index b5142c3872b..78432ed22a7 100644 --- a/runtime/tests/shared/ProcessHelper.cpp +++ b/runtime/tests/shared/ProcessHelper.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* These headers are required for ChildrenTest */ diff --git a/runtime/tests/shared/ProcessHelper.h b/runtime/tests/shared/ProcessHelper.h index a7f49f9b4c9..f092487590d 100644 --- a/runtime/tests/shared/ProcessHelper.h +++ b/runtime/tests/shared/ProcessHelper.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(PROCESSHELPER_H_INCLUDED) diff --git a/runtime/tests/shared/ProtectNewROMClassDataTests.cpp b/runtime/tests/shared/ProtectNewROMClassDataTests.cpp index 599fb97bc59..76dc8fdbaa3 100644 --- a/runtime/tests/shared/ProtectNewROMClassDataTests.cpp +++ b/runtime/tests/shared/ProtectNewROMClassDataTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/ProtectSharedCacheDataTests.cpp b/runtime/tests/shared/ProtectSharedCacheDataTests.cpp index a258e534af6..a3373ee3126 100644 --- a/runtime/tests/shared/ProtectSharedCacheDataTests.cpp +++ b/runtime/tests/shared/ProtectSharedCacheDataTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/SCStoreTransactionTests.cpp b/runtime/tests/shared/SCStoreTransactionTests.cpp index 67cd42237f6..80aceb8120a 100644 --- a/runtime/tests/shared/SCStoreTransactionTests.cpp +++ b/runtime/tests/shared/SCStoreTransactionTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/runtime/tests/shared/SCStoreTransactionTests.hpp b/runtime/tests/shared/SCStoreTransactionTests.hpp index 3754945938a..d9ac04fcd45 100644 --- a/runtime/tests/shared/SCStoreTransactionTests.hpp +++ b/runtime/tests/shared/SCStoreTransactionTests.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_STORE_TRANSACTION_TESTS_H_INCLUDED) diff --git a/runtime/tests/shared/SCStoreWithBCITests.cpp b/runtime/tests/shared/SCStoreWithBCITests.cpp index 8c63ed259ed..ae5a92d3c96 100644 --- a/runtime/tests/shared/SCStoreWithBCITests.cpp +++ b/runtime/tests/shared/SCStoreWithBCITests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/runtime/tests/shared/SCStoreWithBCITests.hpp b/runtime/tests/shared/SCStoreWithBCITests.hpp index cd1f594f8fd..64f5dc89568 100644 --- a/runtime/tests/shared/SCStoreWithBCITests.hpp +++ b/runtime/tests/shared/SCStoreWithBCITests.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_STORE_WITHBCI_TESTS_H_INCLUDED) diff --git a/runtime/tests/shared/SCStringTransactionTests.cpp b/runtime/tests/shared/SCStringTransactionTests.cpp index 58592d8f3aa..dba5a388050 100644 --- a/runtime/tests/shared/SCStringTransactionTests.cpp +++ b/runtime/tests/shared/SCStringTransactionTests.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" diff --git a/runtime/tests/shared/SCStringTransactionTests.hpp b/runtime/tests/shared/SCStringTransactionTests.hpp index 04cb0f34a05..ccd38a252cc 100644 --- a/runtime/tests/shared/SCStringTransactionTests.hpp +++ b/runtime/tests/shared/SCStringTransactionTests.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(J9SC_STRING_TRANSACTION_TESTS_H_INCLUDED) diff --git a/runtime/tests/shared/SCTestCommon.cpp b/runtime/tests/shared/SCTestCommon.cpp index fd72512ecb1..d1124440a2f 100644 --- a/runtime/tests/shared/SCTestCommon.cpp +++ b/runtime/tests/shared/SCTestCommon.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "SCTestCommon.h" diff --git a/runtime/tests/shared/SCTestCommon.h b/runtime/tests/shared/SCTestCommon.h index 0b13c3653b0..fa963b5c853 100644 --- a/runtime/tests/shared/SCTestCommon.h +++ b/runtime/tests/shared/SCTestCommon.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SCTESTCOMMON_H_INCLUDED) diff --git a/runtime/tests/shared/SharedCacheAPITest.cpp b/runtime/tests/shared/SharedCacheAPITest.cpp index 242ed9dee42..4ec328ffd2c 100644 --- a/runtime/tests/shared/SharedCacheAPITest.cpp +++ b/runtime/tests/shared/SharedCacheAPITest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ extern "C" { diff --git a/runtime/tests/shared/SharedCacheAPITest.hpp b/runtime/tests/shared/SharedCacheAPITest.hpp index 6509f6b6e59..6e97323cb52 100644 --- a/runtime/tests/shared/SharedCacheAPITest.hpp +++ b/runtime/tests/shared/SharedCacheAPITest.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(SHAREDCACHEAPITEST_HPP_INCLUDED) #define SHAREDCACHEAPITEST_HPP_INCLUDED diff --git a/runtime/tests/shared/StartupHintsTest.cpp b/runtime/tests/shared/StartupHintsTest.cpp index 66a6e9e140f..6f0c4a87b2c 100644 --- a/runtime/tests/shared/StartupHintsTest.cpp +++ b/runtime/tests/shared/StartupHintsTest.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Includes */ diff --git a/runtime/tests/shared/jvmti/SharedClassesNativeAgent.c b/runtime/tests/shared/jvmti/SharedClassesNativeAgent.c index 5ac2d85629d..8b4fdc52924 100644 --- a/runtime/tests/shared/jvmti/SharedClassesNativeAgent.c +++ b/runtime/tests/shared/jvmti/SharedClassesNativeAgent.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * A simple test JVMTI agent that can exercise the JVM appropriately with the features diff --git a/runtime/tests/shared/jvmti/module.xml b/runtime/tests/shared/jvmti/module.xml index 010ed966269..37e877c0f47 100644 --- a/runtime/tests/shared/jvmti/module.xml +++ b/runtime/tests/shared/jvmti/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/shared/main.c b/runtime/tests/shared/main.c index c8b2b4869ba..fd4b7bdbb57 100644 --- a/runtime/tests/shared/main.c +++ b/runtime/tests/shared/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined WIN32 diff --git a/runtime/tests/shared/main.h b/runtime/tests/shared/main.h index 77f23b1aef8..cb0bd7543af 100644 --- a/runtime/tests/shared/main.h +++ b/runtime/tests/shared/main.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef main_h #define main_h diff --git a/runtime/tests/shared/module.xml b/runtime/tests/shared/module.xml index b61cdd790c7..ff81e866977 100644 --- a/runtime/tests/shared/module.xml +++ b/runtime/tests/shared/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/shared_service/CMakeLists.txt b/runtime/tests/shared_service/CMakeLists.txt index aff815f99e0..d9f3eb9ae68 100644 --- a/runtime/tests/shared_service/CMakeLists.txt +++ b/runtime/tests/shared_service/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_executable(servicetest diff --git a/runtime/tests/shared_service/HelloWorld.java b/runtime/tests/shared_service/HelloWorld.java index 5c252caba8a..3c1f737718d 100644 --- a/runtime/tests/shared_service/HelloWorld.java +++ b/runtime/tests/shared_service/HelloWorld.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // // This Java class is suggested for use by the normal user account diff --git a/runtime/tests/shared_service/ServiceLooping.java b/runtime/tests/shared_service/ServiceLooping.java index 5675fe495f4..c105edea58f 100644 --- a/runtime/tests/shared_service/ServiceLooping.java +++ b/runtime/tests/shared_service/ServiceLooping.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // // This class is suggested for use by the Windows Shared Classes Service diff --git a/runtime/tests/shared_service/SharedService.c b/runtime/tests/shared_service/SharedService.c index a6cd053989e..61f8d091af3 100644 --- a/runtime/tests/shared_service/SharedService.c +++ b/runtime/tests/shared_service/SharedService.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #pragma optimize("", off) diff --git a/runtime/tests/shared_service/module.xml b/runtime/tests/shared_service/module.xml index 3738bcbab0d..75f872c723f 100644 --- a/runtime/tests/shared_service/module.xml +++ b/runtime/tests/shared_service/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/shared_service/readme.txt b/runtime/tests/shared_service/readme.txt index 6ba8958616b..871b8493323 100644 --- a/runtime/tests/shared_service/readme.txt +++ b/runtime/tests/shared_service/readme.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # rem This is a sample bat file that can be used to install and start the Windows diff --git a/runtime/tests/thread/CMakeLists.txt b/runtime/tests/thread/CMakeLists.txt index e6415deb620..315f8d249fd 100644 --- a/runtime/tests/thread/CMakeLists.txt +++ b/runtime/tests/thread/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/thread/aborttest.c b/runtime/tests/thread/aborttest.c index 99ce0c2be93..e7c1ac69d47 100644 --- a/runtime/tests/thread/aborttest.c +++ b/runtime/tests/thread/aborttest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/tests/thread/cuharness/about.html b/runtime/tests/thread/cuharness/about.html index 2f9e7957c48..318a34e25c2 100644 --- a/runtime/tests/thread/cuharness/about.html +++ b/runtime/tests/thread/cuharness/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/runtime/tests/thread/cuharness/module.xml b/runtime/tests/thread/cuharness/module.xml index c983efa4d16..2f58895d93b 100644 --- a/runtime/tests/thread/cuharness/module.xml +++ b/runtime/tests/thread/cuharness/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/thread/cuharness/parser.c b/runtime/tests/thread/cuharness/parser.c index 9388671b3cf..2babf5ee86a 100644 --- a/runtime/tests/thread/cuharness/parser.c +++ b/runtime/tests/thread/cuharness/parser.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "j9port.h" diff --git a/runtime/tests/thread/testnatives/module.xml b/runtime/tests/thread/testnatives/module.xml index 0cf087f0ef7..15084f45504 100644 --- a/runtime/tests/thread/testnatives/module.xml +++ b/runtime/tests/thread/testnatives/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/thread/testnatives/testnatives.c b/runtime/tests/thread/testnatives/testnatives.c index 9a44f589dbc..c5bf7920b5b 100644 --- a/runtime/tests/thread/testnatives/testnatives.c +++ b/runtime/tests/thread/testnatives/testnatives.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #if ! (defined(WIN32) || defined(J9ZOS390)) diff --git a/runtime/tests/thread/testnatives/testnatives.h b/runtime/tests/thread/testnatives/testnatives.h index c0c15648865..35961dc8b0b 100644 --- a/runtime/tests/thread/testnatives/testnatives.h +++ b/runtime/tests/thread/testnatives/testnatives.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(THREAD_TEST_NATIVES_H) diff --git a/runtime/tests/thread/thrnumanatives/module.xml b/runtime/tests/thread/thrnumanatives/module.xml index ccf5f508910..a2dd0e5f143 100644 --- a/runtime/tests/thread/thrnumanatives/module.xml +++ b/runtime/tests/thread/thrnumanatives/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/thread/thrnumanatives/thrnumanatives.c b/runtime/tests/thread/thrnumanatives/thrnumanatives.c index 9e34e1254ed..9dbb442b5a8 100644 --- a/runtime/tests/thread/thrnumanatives/thrnumanatives.c +++ b/runtime/tests/thread/thrnumanatives/thrnumanatives.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/tests/thread/thrstate/module.xml b/runtime/tests/thread/thrstate/module.xml index 9069db843ad..c7b31bd0d95 100644 --- a/runtime/tests/thread/thrstate/module.xml +++ b/runtime/tests/thread/thrstate/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/thread/thrstate/runtest.c b/runtime/tests/thread/thrstate/runtest.c index 858340f0fb6..1c53c946813 100644 --- a/runtime/tests/thread/thrstate/runtest.c +++ b/runtime/tests/thread/thrstate/runtest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jni.h" diff --git a/runtime/tests/thread/thrstate/testcases1.c b/runtime/tests/thread/thrstate/testcases1.c index bd272e17caf..7da34b910ed 100644 --- a/runtime/tests/thread/thrstate/testcases1.c +++ b/runtime/tests/thread/thrstate/testcases1.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/testcases1.h b/runtime/tests/thread/thrstate/testcases1.h index a661868a2ea..1965b8b25dc 100644 --- a/runtime/tests/thread/thrstate/testcases1.h +++ b/runtime/tests/thread/thrstate/testcases1.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _TESTCASES1_H_INCLUDED diff --git a/runtime/tests/thread/thrstate/testcases2.c b/runtime/tests/thread/thrstate/testcases2.c index a85015f090d..dbe878734c6 100644 --- a/runtime/tests/thread/thrstate/testcases2.c +++ b/runtime/tests/thread/thrstate/testcases2.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/testcases2.h b/runtime/tests/thread/thrstate/testcases2.h index 7cf801db4c8..1ce568f6b17 100644 --- a/runtime/tests/thread/thrstate/testcases2.h +++ b/runtime/tests/thread/thrstate/testcases2.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _TESTCASES2_H_INCLUDED diff --git a/runtime/tests/thread/thrstate/testcases3.c b/runtime/tests/thread/thrstate/testcases3.c index d18b8e81622..bf3e8355892 100644 --- a/runtime/tests/thread/thrstate/testcases3.c +++ b/runtime/tests/thread/thrstate/testcases3.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/testcases3.h b/runtime/tests/thread/thrstate/testcases3.h index f4444c51507..f7ae1c42fdd 100644 --- a/runtime/tests/thread/thrstate/testcases3.h +++ b/runtime/tests/thread/thrstate/testcases3.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _TESTCASES3_H_INCLUDED #define _TESTCASES3_H_INCLUDED diff --git a/runtime/tests/thread/thrstate/testcases4.c b/runtime/tests/thread/thrstate/testcases4.c index 989a18232fb..4db50dd0678 100644 --- a/runtime/tests/thread/thrstate/testcases4.c +++ b/runtime/tests/thread/thrstate/testcases4.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/testcases4.h b/runtime/tests/thread/thrstate/testcases4.h index 0246c399e76..9ede4eacade 100644 --- a/runtime/tests/thread/thrstate/testcases4.h +++ b/runtime/tests/thread/thrstate/testcases4.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _TESTCASES4_H_INCLUDED #define _TESTCASES4_H_INCLUDED diff --git a/runtime/tests/thread/thrstate/testcases5.c b/runtime/tests/thread/thrstate/testcases5.c index 2efcc58cdd3..b8c18c96c0b 100644 --- a/runtime/tests/thread/thrstate/testcases5.c +++ b/runtime/tests/thread/thrstate/testcases5.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/testcases5.h b/runtime/tests/thread/thrstate/testcases5.h index d68f17b8313..58f68225879 100644 --- a/runtime/tests/thread/thrstate/testcases5.h +++ b/runtime/tests/thread/thrstate/testcases5.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _TESTCASES5_H_INCLUDED #define _TESTCASES5_H_INCLUDED diff --git a/runtime/tests/thread/thrstate/testcases6.c b/runtime/tests/thread/thrstate/testcases6.c index 572038ff633..7ee9b7d5734 100644 --- a/runtime/tests/thread/thrstate/testcases6.c +++ b/runtime/tests/thread/thrstate/testcases6.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/testcases6.h b/runtime/tests/thread/thrstate/testcases6.h index db2fe04ff50..11a154def58 100644 --- a/runtime/tests/thread/thrstate/testcases6.h +++ b/runtime/tests/thread/thrstate/testcases6.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _TESTCASES6_H_INCLUDED #define _TESTCASES6_H_INCLUDED diff --git a/runtime/tests/thread/thrstate/testsetup.c b/runtime/tests/thread/thrstate/testsetup.c index 074a17236ea..ab4c9eb695a 100644 --- a/runtime/tests/thread/thrstate/testsetup.c +++ b/runtime/tests/thread/thrstate/testsetup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/tests/thread/thrstate/thrstatetest.h b/runtime/tests/thread/thrstate/thrstatetest.h index bb31b0ca4c0..9fb73ce0037 100644 --- a/runtime/tests/thread/thrstate/thrstatetest.h +++ b/runtime/tests/thread/thrstate/thrstatetest.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef THRSTATETEST_H_ diff --git a/runtime/tests/unresolved/CMakeLists.txt b/runtime/tests/unresolved/CMakeLists.txt index ac4f7a9e641..65aaea9acec 100644 --- a/runtime/tests/unresolved/CMakeLists.txt +++ b/runtime/tests/unresolved/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Remove '-Wl,-z,defs' because this test is specifically diff --git a/runtime/tests/unresolved/j9unres.c b/runtime/tests/unresolved/j9unres.c index 0b21ce5d512..b9a066010ad 100644 --- a/runtime/tests/unresolved/j9unres.c +++ b/runtime/tests/unresolved/j9unres.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/tests/unresolved/module.xml b/runtime/tests/unresolved/module.xml index 9a8d7247721..01d449b3320 100644 --- a/runtime/tests/unresolved/module.xml +++ b/runtime/tests/unresolved/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/vm/CMakeLists.txt b/runtime/tests/vm/CMakeLists.txt index 7b56fcd96da..deed6a4d78a 100644 --- a/runtime/tests/vm/CMakeLists.txt +++ b/runtime/tests/vm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/vm/module.xml b/runtime/tests/vm/module.xml index ffd8f547a30..c0e484ad6ae 100644 --- a/runtime/tests/vm/module.xml +++ b/runtime/tests/vm/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/vm/resolvefield_tests.c b/runtime/tests/vm/resolvefield_tests.c index d011080308f..fe21a04f38c 100644 --- a/runtime/tests/vm/resolvefield_tests.c +++ b/runtime/tests/vm/resolvefield_tests.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/tests/vm/testHelpers.c b/runtime/tests/vm/testHelpers.c index 0b8444a018a..7a49c3509e2 100644 --- a/runtime/tests/vm/testHelpers.c +++ b/runtime/tests/vm/testHelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/vm/testHelpers.h b/runtime/tests/vm/testHelpers.h index a0aba28bece..dfdcfadf931 100644 --- a/runtime/tests/vm/testHelpers.h +++ b/runtime/tests/vm/testHelpers.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * @file diff --git a/runtime/tests/vm/vmstubs.c b/runtime/tests/vm/vmstubs.c index a810a636528..0809c5cf921 100644 --- a/runtime/tests/vm/vmstubs.c +++ b/runtime/tests/vm/vmstubs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/tests/vm/vmtest.c b/runtime/tests/vm/vmtest.c index a8cd7a72768..50918494452 100644 --- a/runtime/tests/vm/vmtest.c +++ b/runtime/tests/vm/vmtest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/tests/vm_lifecycle/CMakeLists.txt b/runtime/tests/vm_lifecycle/CMakeLists.txt index 0c98c12fc28..cecf0650e6f 100644 --- a/runtime/tests/vm_lifecycle/CMakeLists.txt +++ b/runtime/tests/vm_lifecycle/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/tests/vm_lifecycle/main.c b/runtime/tests/vm_lifecycle/main.c index ddb60785305..c637c56bccb 100644 --- a/runtime/tests/vm_lifecycle/main.c +++ b/runtime/tests/vm_lifecycle/main.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "exelib_api.h" diff --git a/runtime/tests/vm_lifecycle/module.xml b/runtime/tests/vm_lifecycle/module.xml index 199e6233d83..1d11a04ea3f 100644 --- a/runtime/tests/vm_lifecycle/module.xml +++ b/runtime/tests/vm_lifecycle/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/zos/CMakeLists.txt b/runtime/tests/zos/CMakeLists.txt index 57cd5c1ae02..218de79f269 100644 --- a/runtime/tests/zos/CMakeLists.txt +++ b/runtime/tests/zos/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(zostesting SHARED diff --git a/runtime/tests/zos/module.xml b/runtime/tests/zos/module.xml index 21a6d09e86d..bafc2257bad 100644 --- a/runtime/tests/zos/module.xml +++ b/runtime/tests/zos/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/tests/zos/zosnatives.c b/runtime/tests/zos/zosnatives.c index 660e5a8878e..bd816a4571e 100644 --- a/runtime/tests/zos/zosnatives.c +++ b/runtime/tests/zos/zosnatives.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/thread/CMakeLists.txt b/runtime/thread/CMakeLists.txt index e31957e001e..552ee29fbbb 100644 --- a/runtime/thread/CMakeLists.txt +++ b/runtime/thread/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # Note: We just take the objects provided by omr. diff --git a/runtime/thread/module.xml b/runtime/thread/module.xml index 2d9b4a6ddc4..2deecba039a 100644 --- a/runtime/thread/module.xml +++ b/runtime/thread/module.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/thread/threadshared.mk.ftl b/runtime/thread/threadshared.mk.ftl index a95cfcf0662..229a7b64cc8 100644 --- a/runtime/thread/threadshared.mk.ftl +++ b/runtime/thread/threadshared.mk.ftl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # UMA_PATH_TO_ROOT can be overridden by a command-line argument to 'make'. UMA_PATH_TO_ROOT ?= ../ diff --git a/runtime/util/CMakeLists.txt b/runtime/util/CMakeLists.txt index 946dc8158ed..394304ae25e 100644 --- a/runtime/util/CMakeLists.txt +++ b/runtime/util/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/util/ObjectHash.cpp b/runtime/util/ObjectHash.cpp index 6beec6e4f60..9e649228d83 100644 --- a/runtime/util/ObjectHash.cpp +++ b/runtime/util/ObjectHash.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "util_api.h" diff --git a/runtime/util/VMThreadFlags.cpp b/runtime/util/VMThreadFlags.cpp index fd3803512f0..39fd30f9c2a 100644 --- a/runtime/util/VMThreadFlags.cpp +++ b/runtime/util/VMThreadFlags.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/aix/sethwprefetch.c b/runtime/util/aix/sethwprefetch.c index b09623040a5..84018113144 100644 --- a/runtime/util/aix/sethwprefetch.c +++ b/runtime/util/aix/sethwprefetch.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/alignedmemcpy.c b/runtime/util/alignedmemcpy.c index fbcefb4b86b..395a4c5402b 100644 --- a/runtime/util/alignedmemcpy.c +++ b/runtime/util/alignedmemcpy.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/annhelp.c b/runtime/util/annhelp.c index 2ce79fbe389..b20c1c32fae 100644 --- a/runtime/util/annhelp.c +++ b/runtime/util/annhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "cfreader.h" diff --git a/runtime/util/ap32/volatile.s b/runtime/util/ap32/volatile.s index ef1673fb593..1230729d1fd 100644 --- a/runtime/util/ap32/volatile.s +++ b/runtime/util/ap32/volatile.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .file "volatile.s" .set r0,0 .set r1,1 diff --git a/runtime/util/argbits.c b/runtime/util/argbits.c index 79c8e4882a5..4a27ea5380c 100644 --- a/runtime/util/argbits.c +++ b/runtime/util/argbits.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/argcount.c b/runtime/util/argcount.c index e36ca757267..25f7e362028 100644 --- a/runtime/util/argcount.c +++ b/runtime/util/argcount.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/arm32/volatile.c b/runtime/util/arm32/volatile.c index a8ead0ca9ef..dc4e1d4f08a 100644 --- a/runtime/util/arm32/volatile.c +++ b/runtime/util/arm32/volatile.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/bcdump.c b/runtime/util/bcdump.c index 713e51c9016..ff5ea7131a4 100644 --- a/runtime/util/bcdump.c +++ b/runtime/util/bcdump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/bcdump.h b/runtime/util/bcdump.h index b77fe1e5660..76dedec9e5e 100644 --- a/runtime/util/bcdump.h +++ b/runtime/util/bcdump.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/bcnames.c b/runtime/util/bcnames.c index ac6c3cfde54..c4b14a732b6 100644 --- a/runtime/util/bcnames.c +++ b/runtime/util/bcnames.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9comp.h" diff --git a/runtime/util/binarysup.c b/runtime/util/binarysup.c index 5bbe626c2c1..dbca0c2696e 100644 --- a/runtime/util/binarysup.c +++ b/runtime/util/binarysup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/checkcast.cpp b/runtime/util/checkcast.cpp index d01640e5e2e..daf89d13401 100644 --- a/runtime/util/checkcast.cpp +++ b/runtime/util/checkcast.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VMHelpers.hpp" diff --git a/runtime/util/clang_comp.c b/runtime/util/clang_comp.c index a8dd34e7fd1..3f5c683587d 100644 --- a/runtime/util/clang_comp.c +++ b/runtime/util/clang_comp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/util/cphelp.c b/runtime/util/cphelp.c index 760744259b5..8826093b963 100644 --- a/runtime/util/cphelp.c +++ b/runtime/util/cphelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "hashtable_api.h" #include "util_api.h" diff --git a/runtime/util/cpplink.c b/runtime/util/cpplink.c index b08e7989e75..64be500233d 100644 --- a/runtime/util/cpplink.c +++ b/runtime/util/cpplink.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/defarg.c b/runtime/util/defarg.c index ba483c75a69..63e92677004 100644 --- a/runtime/util/defarg.c +++ b/runtime/util/defarg.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/divhelp.c b/runtime/util/divhelp.c index 82312cd3666..b945b0ee38c 100644 --- a/runtime/util/divhelp.c +++ b/runtime/util/divhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/util/divhelp.h b/runtime/util/divhelp.h index bbdbf1fbc7f..c14bc3703a1 100644 --- a/runtime/util/divhelp.h +++ b/runtime/util/divhelp.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef divhelp_h diff --git a/runtime/util/dllloadinfo.c b/runtime/util/dllloadinfo.c index 8ff8ff85c61..836c8c57c58 100644 --- a/runtime/util/dllloadinfo.c +++ b/runtime/util/dllloadinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/eventframe.c b/runtime/util/eventframe.c index c2247871070..717de1c3002 100644 --- a/runtime/util/eventframe.c +++ b/runtime/util/eventframe.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/extendedHCR.c b/runtime/util/extendedHCR.c index 3649ec266a3..370902deebe 100644 --- a/runtime/util/extendedHCR.c +++ b/runtime/util/extendedHCR.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/extendedmethodblockaccess.c b/runtime/util/extendedmethodblockaccess.c index ef590d2e58b..b6035aa234a 100644 --- a/runtime/util/extendedmethodblockaccess.c +++ b/runtime/util/extendedmethodblockaccess.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/fieldutil.c b/runtime/util/fieldutil.c index 3a7f94fa3bc..441b2d068a3 100644 --- a/runtime/util/fieldutil.c +++ b/runtime/util/fieldutil.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/filecache.c b/runtime/util/filecache.c index a97caeb38d1..a9469f92aa0 100644 --- a/runtime/util/filecache.c +++ b/runtime/util/filecache.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/util/filecache.h b/runtime/util/filecache.h index 0cb59b9b42b..2de7c6faa63 100644 --- a/runtime/util/filecache.h +++ b/runtime/util/filecache.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef filecache_h #define filecache_h diff --git a/runtime/util/final.c b/runtime/util/final.c index b21844efa55..edc0c441f36 100644 --- a/runtime/util/final.c +++ b/runtime/util/final.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/fltconv.c b/runtime/util/fltconv.c index 511b7288130..3db7ee371e4 100644 --- a/runtime/util/fltconv.c +++ b/runtime/util/fltconv.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/util/fltdmath.c b/runtime/util/fltdmath.c index aa64eac15f4..d7b97f4f373 100644 --- a/runtime/util/fltdmath.c +++ b/runtime/util/fltdmath.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/fltmath.c b/runtime/util/fltmath.c index 430155357e7..9db2bfd5c61 100644 --- a/runtime/util/fltmath.c +++ b/runtime/util/fltmath.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include diff --git a/runtime/util/fltodd.c b/runtime/util/fltodd.c index 2adf84f4873..70648861bde 100644 --- a/runtime/util/fltodd.c +++ b/runtime/util/fltodd.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/fltrem.c b/runtime/util/fltrem.c index 2cfc24fdb45..34b9eb5bfdd 100644 --- a/runtime/util/fltrem.c +++ b/runtime/util/fltrem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/fpusup.m4 b/runtime/util/fpusup.m4 index a20b4a839bf..8cbe6ac7182 100644 --- a/runtime/util/fpusup.m4 +++ b/runtime/util/fpusup.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(xhelpers.m4) diff --git a/runtime/util/genericSignalHandler.c b/runtime/util/genericSignalHandler.c index 900dd179e4c..8613ca24e9b 100644 --- a/runtime/util/genericSignalHandler.c +++ b/runtime/util/genericSignalHandler.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/hshelp.c b/runtime/util/hshelp.c index 3f41809d915..584f568b37b 100644 --- a/runtime/util/hshelp.c +++ b/runtime/util/hshelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/hshelp.tdf b/runtime/util/hshelp.tdf index c5e06824c96..0cd592131cc 100644 --- a/runtime/util/hshelp.tdf +++ b/runtime/util/hshelp.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9hshelp DATFileName=J9TraceFormat.dat diff --git a/runtime/util/j9crc32.c b/runtime/util/j9crc32.c index e7f8372b1ec..21106ddeb0c 100644 --- a/runtime/util/j9crc32.c +++ b/runtime/util/j9crc32.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/j9fptr.c b/runtime/util/j9fptr.c index 5ec9c844e35..09b2818738e 100644 --- a/runtime/util/j9fptr.c +++ b/runtime/util/j9fptr.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/j9list.c b/runtime/util/j9list.c index 252770aa923..6fb20d08fc6 100644 --- a/runtime/util/j9list.c +++ b/runtime/util/j9list.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/j9list.h b/runtime/util/j9list.h index 20c62a8b5df..3b7aa450111 100644 --- a/runtime/util/j9list.h +++ b/runtime/util/j9list.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/jbcmap.c b/runtime/util/jbcmap.c index 16a43e88b5d..228b8c5493d 100644 --- a/runtime/util/jbcmap.c +++ b/runtime/util/jbcmap.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/jitfloat.c b/runtime/util/jitfloat.c index 846b656cc07..bc9c9b77f5d 100644 --- a/runtime/util/jitfloat.c +++ b/runtime/util/jitfloat.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/jitlook.c b/runtime/util/jitlook.c index e48e5886097..ab4bba9a11c 100644 --- a/runtime/util/jitlook.c +++ b/runtime/util/jitlook.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/jitregs.c b/runtime/util/jitregs.c index 8ce2e4abdb0..bd4f2dbcd0f 100644 --- a/runtime/util/jitregs.c +++ b/runtime/util/jitregs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/jitresolveframe.c b/runtime/util/jitresolveframe.c index 4745af5a2ea..8af869b8ea2 100644 --- a/runtime/util/jitresolveframe.c +++ b/runtime/util/jitresolveframe.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/jlm.c b/runtime/util/jlm.c index a6ab89df7aa..978f333a06e 100644 --- a/runtime/util/jlm.c +++ b/runtime/util/jlm.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/jnierrhelp.c b/runtime/util/jnierrhelp.c index 2217edbbe8d..a8a5eb14669 100644 --- a/runtime/util/jnierrhelp.c +++ b/runtime/util/jnierrhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/jniprotect.c b/runtime/util/jniprotect.c index 0e2caee3e05..a8257972aa3 100644 --- a/runtime/util/jniprotect.c +++ b/runtime/util/jniprotect.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/linux/osinfo.c b/runtime/util/linux/osinfo.c index bba1b50d305..ac5fd1a6480 100644 --- a/runtime/util/linux/osinfo.c +++ b/runtime/util/linux/osinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/util/modularityHelper.c b/runtime/util/modularityHelper.c index df7c595beb5..e8addc22699 100644 --- a/runtime/util/modularityHelper.c +++ b/runtime/util/modularityHelper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j2sever.h" diff --git a/runtime/util/module.tdf b/runtime/util/module.tdf index 59109d92367..941cd7a3258 100644 --- a/runtime/util/module.tdf +++ b/runtime/util/module.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=module DATFileName=J9TraceFormat.dat diff --git a/runtime/util/module.xml b/runtime/util/module.xml index 407cc75a035..9e00e0836ea 100644 --- a/runtime/util/module.xml +++ b/runtime/util/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/util/moninfo.c b/runtime/util/moninfo.c index 4b1dfc99da0..1471317ac74 100644 --- a/runtime/util/moninfo.c +++ b/runtime/util/moninfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* #define J9VM_DBG */ diff --git a/runtime/util/mthutil.c b/runtime/util/mthutil.c index 7be2787b6fb..ac33ea449f4 100644 --- a/runtime/util/mthutil.c +++ b/runtime/util/mthutil.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/mz31/volatile.s b/runtime/util/mz31/volatile.s index da0fffa7355..1ba696e2b80 100644 --- a/runtime/util/mz31/volatile.s +++ b/runtime/util/mz31/volatile.s @@ -18,8 +18,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TITLE 'volatile.s' VOLATILE7BVVC#START CSECT diff --git a/runtime/util/optinfo.c b/runtime/util/optinfo.c index 031fcf365c3..362701fa371 100644 --- a/runtime/util/optinfo.c +++ b/runtime/util/optinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/pcstack.c b/runtime/util/pcstack.c index 98d2458cc70..ca297479be9 100644 --- a/runtime/util/pcstack.c +++ b/runtime/util/pcstack.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/pkgname.c b/runtime/util/pkgname.c index dd2d60df093..bf0bd630f58 100644 --- a/runtime/util/pkgname.c +++ b/runtime/util/pkgname.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/propsfile.c b/runtime/util/propsfile.c index c3210e57ffe..e28822e7c63 100644 --- a/runtime/util/propsfile.c +++ b/runtime/util/propsfile.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/rcdump.c b/runtime/util/rcdump.c index 70b5952c7c5..6de06a32e69 100644 --- a/runtime/util/rcdump.c +++ b/runtime/util/rcdump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/resolvehelp.c b/runtime/util/resolvehelp.c index 454759aa7b5..921d1664b72 100644 --- a/runtime/util/resolvehelp.c +++ b/runtime/util/resolvehelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/util/returntype.c b/runtime/util/returntype.c index ed652ba6130..52c19d66cd4 100644 --- a/runtime/util/returntype.c +++ b/runtime/util/returntype.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/romclasswalk.c b/runtime/util/romclasswalk.c index 9da09011dba..1c886294998 100644 --- a/runtime/util/romclasswalk.c +++ b/runtime/util/romclasswalk.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9consts.h" diff --git a/runtime/util/romhelp.c b/runtime/util/romhelp.c index 939974fc3c2..e0e3f1560ad 100644 --- a/runtime/util/romhelp.c +++ b/runtime/util/romhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/sendslot.c b/runtime/util/sendslot.c index e86e74635b0..d0056d0722d 100644 --- a/runtime/util/sendslot.c +++ b/runtime/util/sendslot.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/shchelp_j9.c b/runtime/util/shchelp_j9.c index 33fc39b6da4..b0137787e47 100644 --- a/runtime/util/shchelp_j9.c +++ b/runtime/util/shchelp_j9.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "util_api.h" #include "j9version.h" diff --git a/runtime/util/srphashtable.c b/runtime/util/srphashtable.c index e129a4d4782..73c4a7db28f 100644 --- a/runtime/util/srphashtable.c +++ b/runtime/util/srphashtable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/util/srphashtable.tdf b/runtime/util/srphashtable.tdf index 10cafec421c..5b1f6ea45e3 100644 --- a/runtime/util/srphashtable.tdf +++ b/runtime/util/srphashtable.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=srphashtable DATFileName=J9TraceFormat.dat diff --git a/runtime/util/sse2enabled.asm b/runtime/util/sse2enabled.asm index 7b8e2508736..8a9eeb7cb60 100644 --- a/runtime/util/sse2enabled.asm +++ b/runtime/util/sse2enabled.asm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .686p assume cs:flat,ds:flat,ss:flat diff --git a/runtime/util/sse2enabled.s b/runtime/util/sse2enabled.s index 9c0d85e36fc..d500a4c57cb 100644 --- a/runtime/util/sse2enabled.s +++ b/runtime/util/sse2enabled.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ##CODE32 SEGMENT FLAT PUBLIC 'CODE' ##assume cs:flat,ds:flat,ss:flat ##CODE32 ends diff --git a/runtime/util/sse2memclear.asm b/runtime/util/sse2memclear.asm index 1d2ae5e0309..365414eeb90 100644 --- a/runtime/util/sse2memclear.asm +++ b/runtime/util/sse2memclear.asm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .686p assume cs:flat,ds:flat,ss:flat .xmm diff --git a/runtime/util/strhelp.c b/runtime/util/strhelp.c index 813e1f771ac..2efdcd2019a 100644 --- a/runtime/util/strhelp.c +++ b/runtime/util/strhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "util_api.h" diff --git a/runtime/util/subclass.c b/runtime/util/subclass.c index 99b67df333e..6ead6beb8c0 100644 --- a/runtime/util/subclass.c +++ b/runtime/util/subclass.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/sunbcrel.c b/runtime/util/sunbcrel.c index 26dc56685fe..45eaad13893 100644 --- a/runtime/util/sunbcrel.c +++ b/runtime/util/sunbcrel.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/superclass.c b/runtime/util/superclass.c index bcd07f0d3a3..a4e1e369289 100644 --- a/runtime/util/superclass.c +++ b/runtime/util/superclass.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" #include "j9consts.h" diff --git a/runtime/util/thrhelp.c b/runtime/util/thrhelp.c index 304ccb4b0c0..ddd54e0f346 100644 --- a/runtime/util/thrhelp.c +++ b/runtime/util/thrhelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/thrinfo.c b/runtime/util/thrinfo.c index 3130592d5a7..0e7608b4c08 100644 --- a/runtime/util/thrinfo.c +++ b/runtime/util/thrinfo.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* #define J9VM_DBG */ diff --git a/runtime/util/thrname.c b/runtime/util/thrname.c index f55858a443e..43ca09678ed 100644 --- a/runtime/util/thrname.c +++ b/runtime/util/thrname.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/tracehelp.c b/runtime/util/tracehelp.c index a1b3fe41b87..4a340366c32 100644 --- a/runtime/util/tracehelp.c +++ b/runtime/util/tracehelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/utf8hash.c b/runtime/util/utf8hash.c index 265c2f83b7c..81ab0207695 100644 --- a/runtime/util/utf8hash.c +++ b/runtime/util/utf8hash.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "util_api.h" diff --git a/runtime/util/util.tdf b/runtime/util/util.tdf index 2f76a64eb83..0b16f04dbde 100644 --- a/runtime/util/util.tdf +++ b/runtime/util/util.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9util DATFileName=J9TraceFormat.dat diff --git a/runtime/util/util_internal.h b/runtime/util/util_internal.h index e37b5108971..5966a85609c 100644 --- a/runtime/util/util_internal.h +++ b/runtime/util/util_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef util_internal_h diff --git a/runtime/util/vmargs.c b/runtime/util/vmargs.c index 0a717b5c7db..ec2e2dbc89a 100644 --- a/runtime/util/vmargs.c +++ b/runtime/util/vmargs.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/vmihelp.c b/runtime/util/vmihelp.c index 10502437ff1..afbf18fd2ab 100644 --- a/runtime/util/vmihelp.c +++ b/runtime/util/vmihelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "vmi.h" diff --git a/runtime/util/vmstate.c b/runtime/util/vmstate.c index f976e8d6d94..de20b3b03eb 100644 --- a/runtime/util/vmstate.c +++ b/runtime/util/vmstate.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/util/vmutil.tdf b/runtime/util/vmutil.tdf index 12ae10d284d..6235db7bb27 100644 --- a/runtime/util/vmutil.tdf +++ b/runtime/util/vmutil.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9vmutil DATFileName=J9TraceFormat.dat diff --git a/runtime/util/vrfytbl.c b/runtime/util/vrfytbl.c index 9ac3a5523c3..e30b10f1cca 100644 --- a/runtime/util/vrfytbl.c +++ b/runtime/util/vrfytbl.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util/wi32/volatile.asm b/runtime/util/wi32/volatile.asm index 5773c494a2f..67fe7e7da84 100644 --- a/runtime/util/wi32/volatile.asm +++ b/runtime/util/wi32/volatile.asm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .586p assume cs:flat,ds:flat,ss:flat .xmm diff --git a/runtime/util/wildcard.c b/runtime/util/wildcard.c index b749b971989..6539b0735a2 100644 --- a/runtime/util/wildcard.c +++ b/runtime/util/wildcard.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util/win32/openlibrary.c b/runtime/util/win32/openlibrary.c index 7d09af8d7cf..ff123c857f7 100644 --- a/runtime/util/win32/openlibrary.c +++ b/runtime/util/win32/openlibrary.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* windows.h defined UDATA. Ignore its definition */ diff --git a/runtime/util/xi32/volatile.s b/runtime/util/xi32/volatile.s index 0c36483979c..0fd88fd6e37 100644 --- a/runtime/util/xi32/volatile.s +++ b/runtime/util/xi32/volatile.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 eq_pointer_size = 4 eqS_longVolatileRead = 16 eqS_longVolatileWrite = 16 diff --git a/runtime/util/xp32/volatile.s b/runtime/util/xp32/volatile.s index e1884828dcf..b1aa3809543 100644 --- a/runtime/util/xp32/volatile.s +++ b/runtime/util/xp32/volatile.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .file "volatile.s" .set r0,0 .set r1,1 diff --git a/runtime/util/xz31/volatile.s b/runtime/util/xz31/volatile.s index 1163958d661..80b61e8143d 100644 --- a/runtime/util/xz31/volatile.s +++ b/runtime/util/xz31/volatile.s @@ -17,8 +17,8 @@ # [2] https://openjdk.org/legal/assembly-exception.html # # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -# GPL-2.0 WITH Classpath-exception-2.0 OR -# LicenseRef-GPL-2.0 WITH Assembly-exception +# GPL-2.0-only WITH Classpath-exception-2.0 OR +# GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .file "volatile.s" .set r0,0 .set fp0,0 diff --git a/runtime/util/zos/freessp.c b/runtime/util/zos/freessp.c index 129e76f3605..1e98c7ef1f5 100644 --- a/runtime/util/zos/freessp.c +++ b/runtime/util/zos/freessp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/util_core/CMakeLists.txt b/runtime/util_core/CMakeLists.txt index 030efb40fd2..8ab19312b23 100644 --- a/runtime/util_core/CMakeLists.txt +++ b/runtime/util_core/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # UMA has -Werror off everywhere, but so far we have only had trouble with msvc diff --git a/runtime/util_core/j9argscan.c b/runtime/util_core/j9argscan.c index 5b679e020dd..066108e1fb6 100644 --- a/runtime/util_core/j9argscan.c +++ b/runtime/util_core/j9argscan.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/util_core/j9shchelp.c b/runtime/util_core/j9shchelp.c index 7990bd94ef0..2592bf9c597 100644 --- a/runtime/util_core/j9shchelp.c +++ b/runtime/util_core/j9shchelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include #include "j9cfg.h" diff --git a/runtime/util_core/module.xml b/runtime/util_core/module.xml index e97a732af5c..082f36c7ba1 100644 --- a/runtime/util_core/module.xml +++ b/runtime/util_core/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/util_core/vmargs_core.c b/runtime/util_core/vmargs_core.c index 7c5473ee558..248a9a143e6 100644 --- a/runtime/util_core/vmargs_core.c +++ b/runtime/util_core/vmargs_core.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/verbose/CMakeLists.txt b/runtime/verbose/CMakeLists.txt index d6ee2f4fbd1..ebf57d2962c 100644 --- a/runtime/verbose/CMakeLists.txt +++ b/runtime/verbose/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/verbose/errormessage_internal.c b/runtime/verbose/errormessage_internal.c index 2a98d9a83d9..9bdaea846b8 100644 --- a/runtime/verbose/errormessage_internal.c +++ b/runtime/verbose/errormessage_internal.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "errormessage_internal.h" diff --git a/runtime/verbose/errormessage_internal.h b/runtime/verbose/errormessage_internal.h index 3df656ed625..3ad5ffec49d 100644 --- a/runtime/verbose/errormessage_internal.h +++ b/runtime/verbose/errormessage_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef errormessage_internal_h diff --git a/runtime/verbose/errormessagebuffer.c b/runtime/verbose/errormessagebuffer.c index 32f3a6f1ceb..f5b1e2507cd 100644 --- a/runtime/verbose/errormessagebuffer.c +++ b/runtime/verbose/errormessagebuffer.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "errormessage_internal.h" diff --git a/runtime/verbose/errormessageframeworkcfr.c b/runtime/verbose/errormessageframeworkcfr.c index 8b22bcab797..d451ee4ed65 100644 --- a/runtime/verbose/errormessageframeworkcfr.c +++ b/runtime/verbose/errormessageframeworkcfr.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "errormessage_internal.h" diff --git a/runtime/verbose/errormessageframeworkrtv.c b/runtime/verbose/errormessageframeworkrtv.c index 339b2ec11a1..8fc2fb972b9 100644 --- a/runtime/verbose/errormessageframeworkrtv.c +++ b/runtime/verbose/errormessageframeworkrtv.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "errormessage_internal.h" diff --git a/runtime/verbose/errormessagehelper.c b/runtime/verbose/errormessagehelper.c index a3af4ebdfd0..6acc30ce324 100644 --- a/runtime/verbose/errormessagehelper.c +++ b/runtime/verbose/errormessagehelper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "errormessage_internal.h" diff --git a/runtime/verbose/j9vrb.tdf b/runtime/verbose/j9vrb.tdf index d5b5283c11a..db3626348f6 100644 --- a/runtime/verbose/j9vrb.tdf +++ b/runtime/verbose/j9vrb.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9vrb Submodules=j9vmutil,j9util,pool,avl diff --git a/runtime/verbose/module.xml b/runtime/verbose/module.xml index 1c05c6e73ba..4a415ae3405 100644 --- a/runtime/verbose/module.xml +++ b/runtime/verbose/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/verbose/verbose.c b/runtime/verbose/verbose.c index c9e5b38e165..9582a2ae285 100644 --- a/runtime/verbose/verbose.c +++ b/runtime/verbose/verbose.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/verbose/verbose_internal.h b/runtime/verbose/verbose_internal.h index a8efe00ae55..5381b2d6a93 100644 --- a/runtime/verbose/verbose_internal.h +++ b/runtime/verbose/verbose_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef verbose_internal_h diff --git a/runtime/verutil/CMakeLists.txt b/runtime/verutil/CMakeLists.txt index 22e1330fc59..68003703942 100644 --- a/runtime/verutil/CMakeLists.txt +++ b/runtime/verutil/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/verutil/cfrerr.c b/runtime/verutil/cfrerr.c index bbbe83d6a25..25fce4994f4 100644 --- a/runtime/verutil/cfrerr.c +++ b/runtime/verutil/cfrerr.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/verutil/chverify.c b/runtime/verutil/chverify.c index b4ac0a83c5e..53aef24a38b 100644 --- a/runtime/verutil/chverify.c +++ b/runtime/verutil/chverify.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/verutil/module.xml b/runtime/verutil/module.xml index 4bc6fcb2e03..d6ee882aea3 100644 --- a/runtime/verutil/module.xml +++ b/runtime/verutil/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/verutil/sigverify.c b/runtime/verutil/sigverify.c index e16c8c7b08d..820bca41260 100644 --- a/runtime/verutil/sigverify.c +++ b/runtime/verutil/sigverify.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/AsyncMessageHandler.cpp b/runtime/vm/AsyncMessageHandler.cpp index a7695a2723a..4f7e4f405cd 100644 --- a/runtime/vm/AsyncMessageHandler.cpp +++ b/runtime/vm/AsyncMessageHandler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/BytecodeAction.hpp b/runtime/vm/BytecodeAction.hpp index ff133b3caad..9d13a0bd061 100644 --- a/runtime/vm/BytecodeAction.hpp +++ b/runtime/vm/BytecodeAction.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(BYTECODEACTION_HPP_) #define BYTECODEACTION_HPP_ diff --git a/runtime/vm/BytecodeInterpreter.hpp b/runtime/vm/BytecodeInterpreter.hpp index 930f029ad95..54571c66e95 100644 --- a/runtime/vm/BytecodeInterpreter.hpp +++ b/runtime/vm/BytecodeInterpreter.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(BYTECODEINTERPRETER_HPP_) diff --git a/runtime/vm/BytecodeInterpreter.inc b/runtime/vm/BytecodeInterpreter.inc index 6cc78eb3aaf..6a6671bdc6b 100644 --- a/runtime/vm/BytecodeInterpreter.inc +++ b/runtime/vm/BytecodeInterpreter.inc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "clang_comp.h" diff --git a/runtime/vm/BytecodeInterpreterCompressed.cpp b/runtime/vm/BytecodeInterpreterCompressed.cpp index 54af091f677..dac88d29ecd 100644 --- a/runtime/vm/BytecodeInterpreterCompressed.cpp +++ b/runtime/vm/BytecodeInterpreterCompressed.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/BytecodeInterpreterFull.cpp b/runtime/vm/BytecodeInterpreterFull.cpp index bdc90e93d94..4a8c85d2a82 100644 --- a/runtime/vm/BytecodeInterpreterFull.cpp +++ b/runtime/vm/BytecodeInterpreterFull.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/CMakeLists.txt b/runtime/vm/CMakeLists.txt index 306aadfcc08..10d5cf81e02 100644 --- a/runtime/vm/CMakeLists.txt +++ b/runtime/vm/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ omr_add_tracegen(j9vm.tdf) diff --git a/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp b/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp index 1e7ae779a34..5012e80e1f4 100644 --- a/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp +++ b/runtime/vm/CRIUBytecodeInterpreterCompressed.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/CRIUBytecodeInterpreterFull.cpp b/runtime/vm/CRIUBytecodeInterpreterFull.cpp index ff88da6e827..27b3a93f5fa 100644 --- a/runtime/vm/CRIUBytecodeInterpreterFull.cpp +++ b/runtime/vm/CRIUBytecodeInterpreterFull.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/CRIUHelpers.cpp b/runtime/vm/CRIUHelpers.cpp index c9d77ba4be1..e6ab8b8b297 100644 --- a/runtime/vm/CRIUHelpers.cpp +++ b/runtime/vm/CRIUHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/CRIUHelpers.hpp b/runtime/vm/CRIUHelpers.hpp index 2bd7c1fb268..88d86bbb83d 100644 --- a/runtime/vm/CRIUHelpers.hpp +++ b/runtime/vm/CRIUHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(CRIUHELPERS_HPP_) #define CRIUHELPERS_HPP_ diff --git a/runtime/vm/ClassInitialization.cpp b/runtime/vm/ClassInitialization.cpp index 799bdbbc76a..1a8ae56b0c0 100644 --- a/runtime/vm/ClassInitialization.cpp +++ b/runtime/vm/ClassInitialization.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/ContinuationHelpers.cpp b/runtime/vm/ContinuationHelpers.cpp index 094c28e82b3..b35b0b0f56d 100644 --- a/runtime/vm/ContinuationHelpers.cpp +++ b/runtime/vm/ContinuationHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "j9comp.h" diff --git a/runtime/vm/DebugBytecodeInterpreterCompressed.cpp b/runtime/vm/DebugBytecodeInterpreterCompressed.cpp index f3b16036621..f9158cd8ce8 100644 --- a/runtime/vm/DebugBytecodeInterpreterCompressed.cpp +++ b/runtime/vm/DebugBytecodeInterpreterCompressed.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/DebugBytecodeInterpreterFull.cpp b/runtime/vm/DebugBytecodeInterpreterFull.cpp index 10262a1be87..2a46680ba0d 100644 --- a/runtime/vm/DebugBytecodeInterpreterFull.cpp +++ b/runtime/vm/DebugBytecodeInterpreterFull.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/FFITypeHelpers.cpp b/runtime/vm/FFITypeHelpers.cpp index 4a1024b2546..d0feda25452 100644 --- a/runtime/vm/FFITypeHelpers.cpp +++ b/runtime/vm/FFITypeHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "FFITypeHelpers.hpp" diff --git a/runtime/vm/FFITypeHelpers.hpp b/runtime/vm/FFITypeHelpers.hpp index d3761198c4a..4d000115adf 100644 --- a/runtime/vm/FFITypeHelpers.hpp +++ b/runtime/vm/FFITypeHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(FFITYPEHELPERS_HPP_) diff --git a/runtime/vm/FastJNI.cpp b/runtime/vm/FastJNI.cpp index d1e381884b9..a572f045ad6 100644 --- a/runtime/vm/FastJNI.cpp +++ b/runtime/vm/FastJNI.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/FastJNI_com_ibm_oti_vm_VM.cpp b/runtime/vm/FastJNI_com_ibm_oti_vm_VM.cpp index d963fa8b31f..0422bb718ec 100644 --- a/runtime/vm/FastJNI_com_ibm_oti_vm_VM.cpp +++ b/runtime/vm/FastJNI_com_ibm_oti_vm_VM.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/vm/FastJNI_java_lang_Class.cpp b/runtime/vm/FastJNI_java_lang_Class.cpp index 6e007d51c50..bafd12143b5 100644 --- a/runtime/vm/FastJNI_java_lang_Class.cpp +++ b/runtime/vm/FastJNI_java_lang_Class.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_ClassLoader.cpp b/runtime/vm/FastJNI_java_lang_ClassLoader.cpp index 00467f02817..da477017920 100644 --- a/runtime/vm/FastJNI_java_lang_ClassLoader.cpp +++ b/runtime/vm/FastJNI_java_lang_ClassLoader.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_J9VMInternals.cpp b/runtime/vm/FastJNI_java_lang_J9VMInternals.cpp index 09b32f276b7..1fb062b60e0 100644 --- a/runtime/vm/FastJNI_java_lang_J9VMInternals.cpp +++ b/runtime/vm/FastJNI_java_lang_J9VMInternals.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_Object.cpp b/runtime/vm/FastJNI_java_lang_Object.cpp index 1537457f9db..d528f41ed77 100644 --- a/runtime/vm/FastJNI_java_lang_Object.cpp +++ b/runtime/vm/FastJNI_java_lang_Object.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_String.cpp b/runtime/vm/FastJNI_java_lang_String.cpp index 1ec21bfd7e0..5b8d4fe4f93 100644 --- a/runtime/vm/FastJNI_java_lang_String.cpp +++ b/runtime/vm/FastJNI_java_lang_String.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_System.cpp b/runtime/vm/FastJNI_java_lang_System.cpp index 35cdc483dcc..736c6f8926d 100644 --- a/runtime/vm/FastJNI_java_lang_System.cpp +++ b/runtime/vm/FastJNI_java_lang_System.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_Thread.cpp b/runtime/vm/FastJNI_java_lang_Thread.cpp index 32b78402eac..0c19e908cb4 100644 --- a/runtime/vm/FastJNI_java_lang_Thread.cpp +++ b/runtime/vm/FastJNI_java_lang_Thread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_Throwable.cpp b/runtime/vm/FastJNI_java_lang_Throwable.cpp index 6c1cb364089..aba7e6e8b01 100644 --- a/runtime/vm/FastJNI_java_lang_Throwable.cpp +++ b/runtime/vm/FastJNI_java_lang_Throwable.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_invoke_MethodHandle.cpp b/runtime/vm/FastJNI_java_lang_invoke_MethodHandle.cpp index 7eac4c81857..cb1052ee879 100644 --- a/runtime/vm/FastJNI_java_lang_invoke_MethodHandle.cpp +++ b/runtime/vm/FastJNI_java_lang_invoke_MethodHandle.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_ref_Reference.cpp b/runtime/vm/FastJNI_java_lang_ref_Reference.cpp index 8cc94e42b7e..f976c0132ca 100644 --- a/runtime/vm/FastJNI_java_lang_ref_Reference.cpp +++ b/runtime/vm/FastJNI_java_lang_ref_Reference.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_java_lang_reflect_Array.cpp b/runtime/vm/FastJNI_java_lang_reflect_Array.cpp index 7bbe5542ba3..7fdb8cd7349 100644 --- a/runtime/vm/FastJNI_java_lang_reflect_Array.cpp +++ b/runtime/vm/FastJNI_java_lang_reflect_Array.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FastJNI_sun_misc_Unsafe.cpp b/runtime/vm/FastJNI_sun_misc_Unsafe.cpp index 59050cb3fc7..5750b1c6dfc 100644 --- a/runtime/vm/FastJNI_sun_misc_Unsafe.cpp +++ b/runtime/vm/FastJNI_sun_misc_Unsafe.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "fastJNI.h" diff --git a/runtime/vm/FlushProcessWriteBuffers.cpp b/runtime/vm/FlushProcessWriteBuffers.cpp index 12fdad2141f..89fabb16cad 100644 --- a/runtime/vm/FlushProcessWriteBuffers.cpp +++ b/runtime/vm/FlushProcessWriteBuffers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) diff --git a/runtime/vm/J9OMRHelpers.cpp b/runtime/vm/J9OMRHelpers.cpp index 73a99cae642..15d946e707e 100644 --- a/runtime/vm/J9OMRHelpers.cpp +++ b/runtime/vm/J9OMRHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "omr.h" diff --git a/runtime/vm/KeyHashTable.c b/runtime/vm/KeyHashTable.c index 0885cebec13..da493d64340 100644 --- a/runtime/vm/KeyHashTable.c +++ b/runtime/vm/KeyHashTable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/LayoutFFITypeHelpers.cpp b/runtime/vm/LayoutFFITypeHelpers.cpp index c5fc4da8679..6ebe801ddc8 100644 --- a/runtime/vm/LayoutFFITypeHelpers.cpp +++ b/runtime/vm/LayoutFFITypeHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "LayoutFFITypeHelpers.hpp" diff --git a/runtime/vm/LayoutFFITypeHelpers.hpp b/runtime/vm/LayoutFFITypeHelpers.hpp index ef5def659be..d7b994ce46b 100644 --- a/runtime/vm/LayoutFFITypeHelpers.hpp +++ b/runtime/vm/LayoutFFITypeHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(LAYOUTFFITYPEHELPERS_HPP_) diff --git a/runtime/vm/MHInterpreter.hpp b/runtime/vm/MHInterpreter.hpp index 8c89923b393..ee2190b2cb1 100644 --- a/runtime/vm/MHInterpreter.hpp +++ b/runtime/vm/MHInterpreter.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(MHINTERPRETER_HPP_) diff --git a/runtime/vm/MHInterpreter.inc b/runtime/vm/MHInterpreter.inc index e75da8a9fef..5b4c4682a55 100644 --- a/runtime/vm/MHInterpreter.inc +++ b/runtime/vm/MHInterpreter.inc @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "clang_comp.h" #include "j9cfg.h" diff --git a/runtime/vm/MHInterpreterCompressed.cpp b/runtime/vm/MHInterpreterCompressed.cpp index 9ceb8af4b32..24790daffb4 100644 --- a/runtime/vm/MHInterpreterCompressed.cpp +++ b/runtime/vm/MHInterpreterCompressed.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/MHInterpreterFull.cpp b/runtime/vm/MHInterpreterFull.cpp index 6a8169f9bed..8d1947cb81b 100644 --- a/runtime/vm/MHInterpreterFull.cpp +++ b/runtime/vm/MHInterpreterFull.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/ModularityHashTables.c b/runtime/vm/ModularityHashTables.c index 750c4f2f07f..8a5b8d61ae9 100644 --- a/runtime/vm/ModularityHashTables.c +++ b/runtime/vm/ModularityHashTables.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/NativeHelpers.cpp b/runtime/vm/NativeHelpers.cpp index 7ecf807a262..47b0c529f8d 100644 --- a/runtime/vm/NativeHelpers.cpp +++ b/runtime/vm/NativeHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/vm/ObjectFieldInfo.cpp b/runtime/vm/ObjectFieldInfo.cpp index 08f08ff1676..63af43581c3 100644 --- a/runtime/vm/ObjectFieldInfo.cpp +++ b/runtime/vm/ObjectFieldInfo.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/ObjectFieldInfo.hpp b/runtime/vm/ObjectFieldInfo.hpp index 7a33ae8cfd5..681effd3309 100644 --- a/runtime/vm/ObjectFieldInfo.hpp +++ b/runtime/vm/ObjectFieldInfo.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef OBJECTFIELDINFO_HPP_ diff --git a/runtime/vm/ObjectMonitor.cpp b/runtime/vm/ObjectMonitor.cpp index 8a979a859c7..fe4ea9141ca 100644 --- a/runtime/vm/ObjectMonitor.cpp +++ b/runtime/vm/ObjectMonitor.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/vm/OutOfLineINL.hpp b/runtime/vm/OutOfLineINL.hpp index db78344b685..584fc258b95 100644 --- a/runtime/vm/OutOfLineINL.hpp +++ b/runtime/vm/OutOfLineINL.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VM_OUTOFLINEINL_HPP_) diff --git a/runtime/vm/OutOfLineINL_com_ibm_jit_JITHelpers.cpp b/runtime/vm/OutOfLineINL_com_ibm_jit_JITHelpers.cpp index 026d6d2940c..5c064fb47f8 100644 --- a/runtime/vm/OutOfLineINL_com_ibm_jit_JITHelpers.cpp +++ b/runtime/vm/OutOfLineINL_com_ibm_jit_JITHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OutOfLineINL.hpp" diff --git a/runtime/vm/OutOfLineINL_java_lang_invoke_NativeMethodHandle.cpp b/runtime/vm/OutOfLineINL_java_lang_invoke_NativeMethodHandle.cpp index 1018ac3fa4a..731bc4d5523 100644 --- a/runtime/vm/OutOfLineINL_java_lang_invoke_NativeMethodHandle.cpp +++ b/runtime/vm/OutOfLineINL_java_lang_invoke_NativeMethodHandle.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OutOfLineINL.hpp" diff --git a/runtime/vm/OutOfLineINL_jdk_internal_misc_Unsafe.cpp b/runtime/vm/OutOfLineINL_jdk_internal_misc_Unsafe.cpp index a08745569aa..775cbc888ec 100644 --- a/runtime/vm/OutOfLineINL_jdk_internal_misc_Unsafe.cpp +++ b/runtime/vm/OutOfLineINL_jdk_internal_misc_Unsafe.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "OutOfLineINL.hpp" diff --git a/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalDowncallHandler.cpp b/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalDowncallHandler.cpp index 59186e3b762..faf76b4b902 100644 --- a/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalDowncallHandler.cpp +++ b/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalDowncallHandler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "VMHelpers.hpp" diff --git a/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalUpcallHandler.cpp b/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalUpcallHandler.cpp index 678e1bacd5f..b78a21b0976 100644 --- a/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalUpcallHandler.cpp +++ b/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_InternalUpcallHandler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] http://openopenj9.java.net/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_UpCallMHMetaData.cpp b/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_UpCallMHMetaData.cpp index 2d6a1744c20..a9936eb1ed7 100644 --- a/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_UpCallMHMetaData.cpp +++ b/runtime/vm/OutOfLineINL_openj9_internal_foreign_abi_UpCallMHMetaData.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9vmnls.h" diff --git a/runtime/vm/StackDumper.c b/runtime/vm/StackDumper.c index 6729268f11f..7cbacd0d562 100644 --- a/runtime/vm/StackDumper.c +++ b/runtime/vm/StackDumper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/UpcallExceptionHandler.cpp b/runtime/vm/UpcallExceptionHandler.cpp index fb34166d8ef..f316657e9ad 100644 --- a/runtime/vm/UpcallExceptionHandler.cpp +++ b/runtime/vm/UpcallExceptionHandler.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ut_j9vm.h" diff --git a/runtime/vm/UpcallThunkMem.cpp b/runtime/vm/UpcallThunkMem.cpp index 08fda8cb173..52f5d5894c3 100644 --- a/runtime/vm/UpcallThunkMem.cpp +++ b/runtime/vm/UpcallThunkMem.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/UpcallVMHelpers.cpp b/runtime/vm/UpcallVMHelpers.cpp index 1fd15591e88..712a05df34a 100644 --- a/runtime/vm/UpcallVMHelpers.cpp +++ b/runtime/vm/UpcallVMHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/VMAccess.cpp b/runtime/vm/VMAccess.cpp index 214698bf234..f90e5243a5d 100644 --- a/runtime/vm/VMAccess.cpp +++ b/runtime/vm/VMAccess.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Note the required ordering of monitors related to VM access: diff --git a/runtime/vm/ValueTypeHelpers.cpp b/runtime/vm/ValueTypeHelpers.cpp index 0a13a7697ec..db441bd741f 100644 --- a/runtime/vm/ValueTypeHelpers.cpp +++ b/runtime/vm/ValueTypeHelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "ValueTypeHelpers.hpp" diff --git a/runtime/vm/ValueTypeHelpers.hpp b/runtime/vm/ValueTypeHelpers.hpp index 9f8e3cf9cfc..daa256ea20d 100644 --- a/runtime/vm/ValueTypeHelpers.hpp +++ b/runtime/vm/ValueTypeHelpers.hpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if !defined(VALUETYPEHELPERS_HPP_) diff --git a/runtime/vm/annsup.c b/runtime/vm/annsup.c index 9bd51694aab..3c08fef52db 100644 --- a/runtime/vm/annsup.c +++ b/runtime/vm/annsup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/annsup.h b/runtime/vm/annsup.h index e96d49f8d8d..a751d2aea3e 100644 --- a/runtime/vm/annsup.h +++ b/runtime/vm/annsup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/vm/ap32/unsafeHelper.s b/runtime/vm/ap32/unsafeHelper.s index 9c92337904b..be2042b7670 100644 --- a/runtime/vm/ap32/unsafeHelper.s +++ b/runtime/vm/ap32/unsafeHelper.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .globl .unsafePut64[pr] .globl unsafePut64[ds] .globl .unsafePut64 diff --git a/runtime/vm/ap64/UpcallThunkGen.cpp b/runtime/vm/ap64/UpcallThunkGen.cpp index 34755cc45dc..e93cd068f86 100644 --- a/runtime/vm/ap64/UpcallThunkGen.cpp +++ b/runtime/vm/ap64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/ap64/unsafeHelper.s b/runtime/vm/ap64/unsafeHelper.s index 9854d5cc2d7..e8a577a68f1 100644 --- a/runtime/vm/ap64/unsafeHelper.s +++ b/runtime/vm/ap64/unsafeHelper.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .globl .unsafePut64[pr] .globl unsafePut64[ds] .globl .unsafePut64 diff --git a/runtime/vm/arm64cinterp.m4 b/runtime/vm/arm64cinterp.m4 index 91caae1c0f9..af2e1211715 100644 --- a/runtime/vm/arm64cinterp.m4 +++ b/runtime/vm/arm64cinterp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(arm64helpers.m4) diff --git a/runtime/vm/armcinterp.m4 b/runtime/vm/armcinterp.m4 index 7a62b3368a6..80b59ac992a 100644 --- a/runtime/vm/armcinterp.m4 +++ b/runtime/vm/armcinterp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(armhelpers.m4) diff --git a/runtime/vm/bchelper.c b/runtime/vm/bchelper.c index f272551fc07..a45341b1425 100644 --- a/runtime/vm/bchelper.c +++ b/runtime/vm/bchelper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9consts.h" diff --git a/runtime/vm/bindnatv.cpp b/runtime/vm/bindnatv.cpp index 3c1a2973a87..f9373fc1ed3 100644 --- a/runtime/vm/bindnatv.cpp +++ b/runtime/vm/bindnatv.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/callin.cpp b/runtime/vm/callin.cpp index dabe5e93e54..ce6f460c7f9 100644 --- a/runtime/vm/callin.cpp +++ b/runtime/vm/callin.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9accessbarrier.h" diff --git a/runtime/vm/classallocation.c b/runtime/vm/classallocation.c index c90b6e9f8c8..f62f803c164 100644 --- a/runtime/vm/classallocation.c +++ b/runtime/vm/classallocation.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/classloadersearch.c b/runtime/vm/classloadersearch.c index f5edc5697e0..6475d5d3f47 100644 --- a/runtime/vm/classloadersearch.c +++ b/runtime/vm/classloadersearch.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/classname.cpp b/runtime/vm/classname.cpp index 33bce99badc..347c135513f 100644 --- a/runtime/vm/classname.cpp +++ b/runtime/vm/classname.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/classseg.c b/runtime/vm/classseg.c index 836ee5abc96..2e7e7d80484 100644 --- a/runtime/vm/classseg.c +++ b/runtime/vm/classseg.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vm/classsupport.c b/runtime/vm/classsupport.c index 3ffcaae5cce..d924bf249d5 100644 --- a/runtime/vm/classsupport.c +++ b/runtime/vm/classsupport.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/createramclass.cpp b/runtime/vm/createramclass.cpp index 9216af2a2dc..46df214399c 100644 --- a/runtime/vm/createramclass.cpp +++ b/runtime/vm/createramclass.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/description.c b/runtime/vm/description.c index 731a2477a55..491da4e6323 100644 --- a/runtime/vm/description.c +++ b/runtime/vm/description.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/dllsup.c b/runtime/vm/dllsup.c index 37bdf89fdd3..7175b9fd717 100644 --- a/runtime/vm/dllsup.c +++ b/runtime/vm/dllsup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/drophelp.c b/runtime/vm/drophelp.c index 5acba5e1548..cbc907cf6e2 100644 --- a/runtime/vm/drophelp.c +++ b/runtime/vm/drophelp.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "j9protos.h" diff --git a/runtime/vm/exceptiondescribe.c b/runtime/vm/exceptiondescribe.c index 79adc766d03..2225d1853bb 100644 --- a/runtime/vm/exceptiondescribe.c +++ b/runtime/vm/exceptiondescribe.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/exceptionsupport.c b/runtime/vm/exceptionsupport.c index 7e0a230f20b..54fac1bcc86 100644 --- a/runtime/vm/exceptionsupport.c +++ b/runtime/vm/exceptionsupport.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/extendedMessageNPE.cpp b/runtime/vm/extendedMessageNPE.cpp index 6d4b0736818..f4d92634208 100644 --- a/runtime/vm/extendedMessageNPE.cpp +++ b/runtime/vm/extendedMessageNPE.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "bcverify.h" diff --git a/runtime/vm/findmethod.c b/runtime/vm/findmethod.c index dcf362bedc0..811643f8e0a 100644 --- a/runtime/vm/findmethod.c +++ b/runtime/vm/findmethod.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/gphandle.c b/runtime/vm/gphandle.c index cd765726e7f..2766b121155 100644 --- a/runtime/vm/gphandle.c +++ b/runtime/vm/gphandle.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Turn off FPO optimisation on Windows 32-bit to improve native stack traces */ diff --git a/runtime/vm/growstack.cpp b/runtime/vm/growstack.cpp index 301c167e829..45d305a4d12 100644 --- a/runtime/vm/growstack.cpp +++ b/runtime/vm/growstack.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* #define PAINT_OLD_STACK */ diff --git a/runtime/vm/guardedstorage.c b/runtime/vm/guardedstorage.c index 24c834f428b..cccf273b885 100644 --- a/runtime/vm/guardedstorage.c +++ b/runtime/vm/guardedstorage.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/hookableAsync.c b/runtime/vm/hookableAsync.c index 913472a5df7..ad46493412f 100644 --- a/runtime/vm/hookableAsync.c +++ b/runtime/vm/hookableAsync.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/initsendtarget.cpp b/runtime/vm/initsendtarget.cpp index a8956b83656..2c4cc28d7ff 100644 --- a/runtime/vm/initsendtarget.cpp +++ b/runtime/vm/initsendtarget.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/inlineleconditionhandler.c b/runtime/vm/inlineleconditionhandler.c index 43621b78ac6..00da50803d2 100644 --- a/runtime/vm/inlineleconditionhandler.c +++ b/runtime/vm/inlineleconditionhandler.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/vm/intfunc.c b/runtime/vm/intfunc.c index 05d1fb7d68f..108301c1451 100644 --- a/runtime/vm/intfunc.c +++ b/runtime/vm/intfunc.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/vm/j9vm.tdf b/runtime/vm/j9vm.tdf index 5248dcd7f76..e219c5f44cf 100644 --- a/runtime/vm/j9vm.tdf +++ b/runtime/vm/j9vm.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9vm Submodules=j9vmutil,j9util,pool,avl,map,j9bcverify,j9bcu,module diff --git a/runtime/vm/javaPriority.c b/runtime/vm/javaPriority.c index 78b99d90355..08d0e6473a1 100644 --- a/runtime/vm/javaPriority.c +++ b/runtime/vm/javaPriority.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/runtime/vm/javaPriority.h b/runtime/vm/javaPriority.h index a0ac708c864..6161a6316bb 100644 --- a/runtime/vm/javaPriority.h +++ b/runtime/vm/javaPriority.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef javapriority_h diff --git a/runtime/vm/jnicgen.c b/runtime/vm/jnicgen.c index c61650c97eb..5ca91f31149 100644 --- a/runtime/vm/jnicgen.c +++ b/runtime/vm/jnicgen.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnicsup.h" diff --git a/runtime/vm/jnicsup.cpp b/runtime/vm/jnicsup.cpp index 579cb1a6ecc..4b7d85b27be 100644 --- a/runtime/vm/jnicsup.cpp +++ b/runtime/vm/jnicsup.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/jnicsup.h b/runtime/vm/jnicsup.h index b3790c67f52..edf806657a6 100644 --- a/runtime/vm/jnicsup.h +++ b/runtime/vm/jnicsup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jnicsup_h diff --git a/runtime/vm/jnifield.cpp b/runtime/vm/jnifield.cpp index b92320fa3d2..78e8ebd35a6 100644 --- a/runtime/vm/jnifield.cpp +++ b/runtime/vm/jnifield.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnifield.h" diff --git a/runtime/vm/jnifield.h b/runtime/vm/jnifield.h index 2a1a09564fb..410b56c9457 100644 --- a/runtime/vm/jnifield.h +++ b/runtime/vm/jnifield.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JNIFIELDSUP_H_ diff --git a/runtime/vm/jniinv.c b/runtime/vm/jniinv.c index 147c79d4afa..59b37e82b93 100644 --- a/runtime/vm/jniinv.c +++ b/runtime/vm/jniinv.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/jnimem.c b/runtime/vm/jnimem.c index 35fc6844f48..6eb743f39c7 100644 --- a/runtime/vm/jnimem.c +++ b/runtime/vm/jnimem.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/jnimisc.cpp b/runtime/vm/jnimisc.cpp index 1e24ba14be5..0ca235fa2b6 100644 --- a/runtime/vm/jnimisc.cpp +++ b/runtime/vm/jnimisc.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j2sever.h" diff --git a/runtime/vm/jnireflect.cpp b/runtime/vm/jnireflect.cpp index ed9a42d6244..42bbac94de1 100644 --- a/runtime/vm/jnireflect.cpp +++ b/runtime/vm/jnireflect.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jnireflect.h" diff --git a/runtime/vm/jnireflect.h b/runtime/vm/jnireflect.h index a379b579fb2..cab042c9ca6 100644 --- a/runtime/vm/jnireflect.h +++ b/runtime/vm/jnireflect.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JNIREFLECT_H_ #define JNIREFLECT_H_ diff --git a/runtime/vm/jvmfree.c b/runtime/vm/jvmfree.c index cfa1963e1b1..c38197ae369 100644 --- a/runtime/vm/jvmfree.c +++ b/runtime/vm/jvmfree.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/jvminit.c b/runtime/vm/jvminit.c index 4f37fe75954..7c6285778a0 100644 --- a/runtime/vm/jvminit.c +++ b/runtime/vm/jvminit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) diff --git a/runtime/vm/jvminitcommon.c b/runtime/vm/jvminitcommon.c index 4e0512873fa..0da9be17a99 100644 --- a/runtime/vm/jvminitcommon.c +++ b/runtime/vm/jvminitcommon.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "jvminitcommon.h" diff --git a/runtime/vm/jvminitcommon.h b/runtime/vm/jvminitcommon.h index 258763e8271..b24e80e18f1 100644 --- a/runtime/vm/jvminitcommon.h +++ b/runtime/vm/jvminitcommon.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef jvminitcommon_h diff --git a/runtime/vm/jvmrisup.c b/runtime/vm/jvmrisup.c index 9bdc57585e7..ff9ff6330bb 100644 --- a/runtime/vm/jvmrisup.c +++ b/runtime/vm/jvmrisup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #if defined(WIN32) || defined (WIN64) diff --git a/runtime/vm/jvmstackusage.h b/runtime/vm/jvmstackusage.h index 739e2e29d6f..2608055443f 100644 --- a/runtime/vm/jvmstackusage.h +++ b/runtime/vm/jvmstackusage.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef JVMSTACKUSAGE_H_ diff --git a/runtime/vm/leconditionexceptionsup.c b/runtime/vm/leconditionexceptionsup.c index 19cac4fc2d2..5e07baecfde 100644 --- a/runtime/vm/leconditionexceptionsup.c +++ b/runtime/vm/leconditionexceptionsup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9cfg.h" diff --git a/runtime/vm/leconditionexceptionsup.h b/runtime/vm/leconditionexceptionsup.h index 611e0dd6f7b..3827c867205 100644 --- a/runtime/vm/leconditionexceptionsup.h +++ b/runtime/vm/leconditionexceptionsup.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/vm/linearswalk.c b/runtime/vm/linearswalk.c index 43105a96dc8..bfb4c69f3ce 100644 --- a/runtime/vm/linearswalk.c +++ b/runtime/vm/linearswalk.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/linearswalk.h b/runtime/vm/linearswalk.h index b8f57c9eb50..53f4f2f3132 100644 --- a/runtime/vm/linearswalk.h +++ b/runtime/vm/linearswalk.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef _LINEARSLOTWALKER_H diff --git a/runtime/vm/lockwordconfig.c b/runtime/vm/lockwordconfig.c index f52608ad705..bd479761927 100644 --- a/runtime/vm/lockwordconfig.c +++ b/runtime/vm/lockwordconfig.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" #include "util_internal.h" diff --git a/runtime/vm/logsupport.c b/runtime/vm/logsupport.c index d89636ee2d9..18e99833fb9 100644 --- a/runtime/vm/logsupport.c +++ b/runtime/vm/logsupport.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/lookuphelper.c b/runtime/vm/lookuphelper.c index cee65545f88..4e1afd04c78 100644 --- a/runtime/vm/lookuphelper.c +++ b/runtime/vm/lookuphelper.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9consts.h" diff --git a/runtime/vm/lookupmethod.c b/runtime/vm/lookupmethod.c index 4f2800c2a3f..04782eb8667 100644 --- a/runtime/vm/lookupmethod.c +++ b/runtime/vm/lookupmethod.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/module.xml b/runtime/vm/module.xml index c5bfd6c473c..174e77e70b9 100644 --- a/runtime/vm/module.xml +++ b/runtime/vm/module.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/vm/monhelpers.c b/runtime/vm/monhelpers.c index 127085be2ac..430843f467b 100644 --- a/runtime/vm/monhelpers.c +++ b/runtime/vm/monhelpers.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/montable.c b/runtime/vm/montable.c index 917cbebae2e..caf9397242d 100644 --- a/runtime/vm/montable.c +++ b/runtime/vm/montable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/mz31/unsafeHelper.s b/runtime/vm/mz31/unsafeHelper.s index d71e3bf5a27..cebbadb97d6 100644 --- a/runtime/vm/mz31/unsafeHelper.s +++ b/runtime/vm/mz31/unsafeHelper.s @@ -18,8 +18,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TITLE 'unsafeHelper.s' UNSAFEHELPER7BVVC#START CSECT diff --git a/runtime/vm/mz64/UpcallThunkGen.cpp b/runtime/vm/mz64/UpcallThunkGen.cpp index 81424bcbc86..a983b7fa1b2 100644 --- a/runtime/vm/mz64/UpcallThunkGen.cpp +++ b/runtime/vm/mz64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/mz64/unsafeHelper.s b/runtime/vm/mz64/unsafeHelper.s index 0dac1ae4100..b82457eefd2 100644 --- a/runtime/vm/mz64/unsafeHelper.s +++ b/runtime/vm/mz64/unsafeHelper.s @@ -18,8 +18,8 @@ * [2] https://openjdk.org/legal/assembly-exception.html * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -* GPL-2.0 WITH Classpath-exception-2.0 OR -* LicenseRef-GPL-2.0 WITH Assembly-exception +* GPL-2.0-only WITH Classpath-exception-2.0 OR +* GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 TITLE 'unsafeHelper.s' UNSAFEHELPER7BVVC#START CSECT diff --git a/runtime/vm/ownedmonitors.c b/runtime/vm/ownedmonitors.c index 6e15ec3a999..d6f2c48ca17 100644 --- a/runtime/vm/ownedmonitors.c +++ b/runtime/vm/ownedmonitors.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" #include "rommeth.h" diff --git a/runtime/vm/pcinterp.m4 b/runtime/vm/pcinterp.m4 index c38c66abc08..8146b8fac57 100644 --- a/runtime/vm/pcinterp.m4 +++ b/runtime/vm/pcinterp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(phelpers.m4) diff --git a/runtime/vm/profilingbc.c b/runtime/vm/profilingbc.c index d75c604282f..e1f37f283b2 100644 --- a/runtime/vm/profilingbc.c +++ b/runtime/vm/profilingbc.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/rasdump.c b/runtime/vm/rasdump.c index dd63773900e..20063a3d066 100644 --- a/runtime/vm/rasdump.c +++ b/runtime/vm/rasdump.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/rastrace.c b/runtime/vm/rastrace.c index de9521882bf..27ce4642b29 100644 --- a/runtime/vm/rastrace.c +++ b/runtime/vm/rastrace.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/vm/resolvefield.cpp b/runtime/vm/resolvefield.cpp index 64d7052dfcd..4fb94a72540 100644 --- a/runtime/vm/resolvefield.cpp +++ b/runtime/vm/resolvefield.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/resolvesupport.cpp b/runtime/vm/resolvesupport.cpp index 1160235c20c..0fbcb171b2b 100644 --- a/runtime/vm/resolvesupport.cpp +++ b/runtime/vm/resolvesupport.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j2sever.h" diff --git a/runtime/vm/riscvcinterp.m4 b/runtime/vm/riscvcinterp.m4 index 83b7d434c10..c9a564fa3cc 100644 --- a/runtime/vm/riscvcinterp.m4 +++ b/runtime/vm/riscvcinterp.m4 @@ -16,7 +16,7 @@ dnl dnl M(1) https://www.gnu.org/software/classpath/license.html dnl M(2) https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(riscvhelpers.m4) diff --git a/runtime/vm/romclasses.c b/runtime/vm/romclasses.c index dd9dc52800a..3ed3d4bdc38 100644 --- a/runtime/vm/romclasses.c +++ b/runtime/vm/romclasses.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/romutil.c b/runtime/vm/romutil.c index 8f9540c1c95..48acd1a09f9 100644 --- a/runtime/vm/romutil.c +++ b/runtime/vm/romutil.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* File renamed to romutil.c */ diff --git a/runtime/vm/rv64/unsafeHelper.s b/runtime/vm/rv64/unsafeHelper.s index 16b1a97582e..03fe1bf103f 100644 --- a/runtime/vm/rv64/unsafeHelper.s +++ b/runtime/vm/rv64/unsafeHelper.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .text diff --git a/runtime/vm/safeseh.asm b/runtime/vm/safeseh.asm index 22c3128d68f..17dbdae18b4 100644 --- a/runtime/vm/safeseh.asm +++ b/runtime/vm/safeseh.asm @@ -16,7 +16,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .386 .model flat diff --git a/runtime/vm/segment.c b/runtime/vm/segment.c index 68c57042357..801e177d85c 100644 --- a/runtime/vm/segment.c +++ b/runtime/vm/segment.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/statistics.c b/runtime/vm/statistics.c index 5e73cecf7c2..81b2c0cf8cb 100644 --- a/runtime/vm/statistics.c +++ b/runtime/vm/statistics.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/stringhelpers.cpp b/runtime/vm/stringhelpers.cpp index 97982cb4311..897badd7d9a 100644 --- a/runtime/vm/stringhelpers.cpp +++ b/runtime/vm/stringhelpers.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/swalk.c b/runtime/vm/swalk.c index ce1dc6137d9..a41008f073e 100644 --- a/runtime/vm/swalk.c +++ b/runtime/vm/swalk.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/threadhelp.cpp b/runtime/vm/threadhelp.cpp index d6695435632..3b28f2ba306 100644 --- a/runtime/vm/threadhelp.cpp +++ b/runtime/vm/threadhelp.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/threadpark.c b/runtime/vm/threadpark.c index b5e7099c253..46777f6f400 100644 --- a/runtime/vm/threadpark.c +++ b/runtime/vm/threadpark.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/throwexception.c b/runtime/vm/throwexception.c index 96019206a35..cb5ec41db0f 100644 --- a/runtime/vm/throwexception.c +++ b/runtime/vm/throwexception.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/visible.c b/runtime/vm/visible.c index 53e19473383..d61765fc18f 100644 --- a/runtime/vm/visible.c +++ b/runtime/vm/visible.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j2sever.h" #include "j9.h" diff --git a/runtime/vm/vm_internal.h b/runtime/vm/vm_internal.h index 6f590f64458..432ccc93c2c 100644 --- a/runtime/vm/vm_internal.h +++ b/runtime/vm/vm_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vm_internal_h diff --git a/runtime/vm/vmbootlib.c b/runtime/vm/vmbootlib.c index 9318e456fec..e4b4ecc1140 100644 --- a/runtime/vm/vmbootlib.c +++ b/runtime/vm/vmbootlib.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/vmhook.c b/runtime/vm/vmhook.c index 268da869cab..ce6e0637d93 100644 --- a/runtime/vm/vmhook.c +++ b/runtime/vm/vmhook.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/vmifunc.c b/runtime/vm/vmifunc.c index f2bfd85d530..bd0d053f829 100644 --- a/runtime/vm/vmifunc.c +++ b/runtime/vm/vmifunc.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/vmizip.c b/runtime/vm/vmizip.c index 0b44c7cf4c3..14ffe31ec56 100644 --- a/runtime/vm/vmizip.c +++ b/runtime/vm/vmizip.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "vmi.h" #include "j9.h" diff --git a/runtime/vm/vmphases.c b/runtime/vm/vmphases.c index 499835ea75b..33bd249e202 100644 --- a/runtime/vm/vmphases.c +++ b/runtime/vm/vmphases.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/vmprops.c b/runtime/vm/vmprops.c index fd3af6ab34d..8cd6257ac6a 100644 --- a/runtime/vm/vmprops.c +++ b/runtime/vm/vmprops.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/vmruntimestate.c b/runtime/vm/vmruntimestate.c index 96c35fd728a..2b35e64b9f7 100644 --- a/runtime/vm/vmruntimestate.c +++ b/runtime/vm/vmruntimestate.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9protos.h" diff --git a/runtime/vm/vmthinit.c b/runtime/vm/vmthinit.c index 543829a7e62..1ff64e2b4b5 100644 --- a/runtime/vm/vmthinit.c +++ b/runtime/vm/vmthinit.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* #define J9VM_DBG */ diff --git a/runtime/vm/vmthread.cpp b/runtime/vm/vmthread.cpp index 57d4922aa28..b2a080a0f44 100644 --- a/runtime/vm/vmthread.cpp +++ b/runtime/vm/vmthread.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* #define J9VM_DBG */ diff --git a/runtime/vm/wa64/UpcallThunkGen.cpp b/runtime/vm/wa64/UpcallThunkGen.cpp index 6371b3aeb5c..e0df40ed924 100644 --- a/runtime/vm/wa64/UpcallThunkGen.cpp +++ b/runtime/vm/wa64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/wa64/stackswap.m4 b/runtime/vm/wa64/stackswap.m4 index 91851d9309f..102427d7e3a 100644 --- a/runtime/vm/wa64/stackswap.m4 +++ b/runtime/vm/wa64/stackswap.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/vm/wi32/inlineseh.c b/runtime/vm/wi32/inlineseh.c index 873c8f18b6c..9cdac78689e 100644 --- a/runtime/vm/wi32/inlineseh.c +++ b/runtime/vm/wi32/inlineseh.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include diff --git a/runtime/vm/wi32/stackswap.m4 b/runtime/vm/wi32/stackswap.m4 index ac9b1c20aed..e46e883b8dd 100644 --- a/runtime/vm/wi32/stackswap.m4 +++ b/runtime/vm/wi32/stackswap.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/vm/xa64/UpcallThunkGen.cpp b/runtime/vm/xa64/UpcallThunkGen.cpp index 9bdd61ea41b..89bab688c2d 100644 --- a/runtime/vm/xa64/UpcallThunkGen.cpp +++ b/runtime/vm/xa64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/xa64/stackswap.m4 b/runtime/vm/xa64/stackswap.m4 index 00058886a7c..fa96192802e 100644 --- a/runtime/vm/xa64/stackswap.m4 +++ b/runtime/vm/xa64/stackswap.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(xhelpers.m4) diff --git a/runtime/vm/xa64/unsafeHelper.m4 b/runtime/vm/xa64/unsafeHelper.m4 index 385bd8111b4..ce5746275ec 100644 --- a/runtime/vm/xa64/unsafeHelper.m4 +++ b/runtime/vm/xa64/unsafeHelper.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(xhelpers.m4) diff --git a/runtime/vm/xcheck.c b/runtime/vm/xcheck.c index 7fc64d4592a..985907ce433 100644 --- a/runtime/vm/xcheck.c +++ b/runtime/vm/xcheck.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/xcinterp.m4 b/runtime/vm/xcinterp.m4 index 71a1c06dc1d..60828d54c84 100644 --- a/runtime/vm/xcinterp.m4 +++ b/runtime/vm/xcinterp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(xhelpers.m4) diff --git a/runtime/vm/xi32/stackswap.m4 b/runtime/vm/xi32/stackswap.m4 index 6eaaaee164a..c5ca87474a6 100644 --- a/runtime/vm/xi32/stackswap.m4 +++ b/runtime/vm/xi32/stackswap.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(jilvalues.m4) diff --git a/runtime/vm/xi32/unsafeHelper.s b/runtime/vm/xi32/unsafeHelper.s index 6bc88da9d81..35002c95fc4 100644 --- a/runtime/vm/xi32/unsafeHelper.s +++ b/runtime/vm/xi32/unsafeHelper.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .globl unsafePut64 .globl unsafePut32 .globl unsafePut16 diff --git a/runtime/vm/xl64/UpcallThunkGen.cpp b/runtime/vm/xl64/UpcallThunkGen.cpp index d5a5641016d..1d654fad528 100644 --- a/runtime/vm/xl64/UpcallThunkGen.cpp +++ b/runtime/vm/xl64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/xl64/unsafeHelper.s b/runtime/vm/xl64/unsafeHelper.s index bf9fad26c34..59453b19ce1 100644 --- a/runtime/vm/xl64/unsafeHelper.s +++ b/runtime/vm/xl64/unsafeHelper.s @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .globl unsafePut64 .type unsafePut64,@function .globl unsafePut32 diff --git a/runtime/vm/xr32/unsafeHelper.s b/runtime/vm/xr32/unsafeHelper.s index 0108a93e7cb..87bae9bdad6 100644 --- a/runtime/vm/xr32/unsafeHelper.s +++ b/runtime/vm/xr32/unsafeHelper.s @@ -16,7 +16,7 @@ @ [1] https://www.gnu.org/software/classpath/license.html @ [2] https://openjdk.org/legal/assembly-exception.html @ -@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .text @ Prototype: void unsafePut64(I_64 *address, I_64 value); @ Defined in: #Args: 2 diff --git a/runtime/vm/xr64/UpcallThunkGen.cpp b/runtime/vm/xr64/UpcallThunkGen.cpp index 1a7b105832c..1f8eeeb37c7 100644 --- a/runtime/vm/xr64/UpcallThunkGen.cpp +++ b/runtime/vm/xr64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/xr64/unsafeHelper.m4 b/runtime/vm/xr64/unsafeHelper.m4 index 97d0ff97aa6..a9df0019cd3 100644 --- a/runtime/vm/xr64/unsafeHelper.m4 +++ b/runtime/vm/xr64/unsafeHelper.m4 @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(arm64helpers.m4) diff --git a/runtime/vm/xz31/unsafeHelper.s b/runtime/vm/xz31/unsafeHelper.s index 25919aeacac..06236d4d442 100644 --- a/runtime/vm/xz31/unsafeHelper.s +++ b/runtime/vm/xz31/unsafeHelper.s @@ -17,8 +17,8 @@ # [2] https://openjdk.org/legal/assembly-exception.html # # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -# GPL-2.0 WITH Classpath-exception-2.0 OR -# LicenseRef-GPL-2.0 WITH Assembly-exception +# GPL-2.0-only WITH Classpath-exception-2.0 OR +# GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .globl unsafePut64 .type unsafePut64,@function .globl unsafePut32 diff --git a/runtime/vm/xz64/UpcallThunkGen.cpp b/runtime/vm/xz64/UpcallThunkGen.cpp index d583b1989cb..2f883fd64b3 100644 --- a/runtime/vm/xz64/UpcallThunkGen.cpp +++ b/runtime/vm/xz64/UpcallThunkGen.cpp @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vm/xz64/unsafeHelper.s b/runtime/vm/xz64/unsafeHelper.s index c3d578da174..240997b7e66 100644 --- a/runtime/vm/xz64/unsafeHelper.s +++ b/runtime/vm/xz64/unsafeHelper.s @@ -17,8 +17,8 @@ # [2] https://openjdk.org/legal/assembly-exception.html # # SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR -# GPL-2.0 WITH Classpath-exception-2.0 OR -# LicenseRef-GPL-2.0 WITH Assembly-exception +# GPL-2.0-only WITH Classpath-exception-2.0 OR +# GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .globl unsafePut64 .type unsafePut64,@function .globl unsafePut32 diff --git a/runtime/vm/zcinterp.m4 b/runtime/vm/zcinterp.m4 index a99dd1439a7..eeb2aa7bc02 100644 --- a/runtime/vm/zcinterp.m4 +++ b/runtime/vm/zcinterp.m4 @@ -16,7 +16,7 @@ dnl dnl [1] https://www.gnu.org/software/classpath/license.html dnl [2] https://openjdk.org/legal/assembly-exception.html dnl -dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +dnl SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 include(zhelpers.m4) diff --git a/runtime/vmchk/CMakeLists.txt b/runtime/vmchk/CMakeLists.txt index 179f5622e5e..909bcc85723 100644 --- a/runtime/vmchk/CMakeLists.txt +++ b/runtime/vmchk/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/vmchk/checkclasses.c b/runtime/vmchk/checkclasses.c index 15b9e5892d3..f01ca29cde5 100644 --- a/runtime/vmchk/checkclasses.c +++ b/runtime/vmchk/checkclasses.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vmchk/checkclconstraints.c b/runtime/vmchk/checkclconstraints.c index 2667f6e1da7..6b02f823dc9 100644 --- a/runtime/vmchk/checkclconstraints.c +++ b/runtime/vmchk/checkclconstraints.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9.h" diff --git a/runtime/vmchk/checkinterntable.c b/runtime/vmchk/checkinterntable.c index 131a43957dd..c057d161467 100644 --- a/runtime/vmchk/checkinterntable.c +++ b/runtime/vmchk/checkinterntable.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vmchk/checkmethods.c b/runtime/vmchk/checkmethods.c index f21168b387b..995491520b6 100644 --- a/runtime/vmchk/checkmethods.c +++ b/runtime/vmchk/checkmethods.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vmchk/checkromclasses.c b/runtime/vmchk/checkromclasses.c index c152de28bbb..d5280b389fe 100644 --- a/runtime/vmchk/checkromclasses.c +++ b/runtime/vmchk/checkromclasses.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vmchk/checkthreads.c b/runtime/vmchk/checkthreads.c index 0e111bcf906..113917b73ae 100644 --- a/runtime/vmchk/checkthreads.c +++ b/runtime/vmchk/checkthreads.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vmchk/j9vmchk.tdf b/runtime/vmchk/j9vmchk.tdf index 41b7e3e5b05..cc7d1f698e6 100644 --- a/runtime/vmchk/j9vmchk.tdf +++ b/runtime/vmchk/j9vmchk.tdf @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Executable=j9vmchk DATFileName=J9TraceFormat.dat diff --git a/runtime/vmchk/module.xml b/runtime/vmchk/module.xml index 0137b128548..fb9ef8b2c55 100644 --- a/runtime/vmchk/module.xml +++ b/runtime/vmchk/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/vmchk/vmcheck.c b/runtime/vmchk/vmcheck.c index 5e13832a570..b61ad457368 100644 --- a/runtime/vmchk/vmcheck.c +++ b/runtime/vmchk/vmcheck.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/vmchk/vmcheck.h b/runtime/vmchk/vmcheck.h index f117b2e81bf..1893a1c67e4 100644 --- a/runtime/vmchk/vmcheck.h +++ b/runtime/vmchk/vmcheck.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef vmcheck_h diff --git a/runtime/win/module.xml b/runtime/win/module.xml index b1bbe044ac0..aea9c60445f 100644 --- a/runtime/win/module.xml +++ b/runtime/win/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/win_64/module.xml b/runtime/win_64/module.xml index d0e0747e767..aba361a8545 100644 --- a/runtime/win_64/module.xml +++ b/runtime/win_64/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/zip/CMakeLists.txt b/runtime/zip/CMakeLists.txt index c4afb958c7e..d4102b0e004 100644 --- a/runtime/zip/CMakeLists.txt +++ b/runtime/zip/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ set(OMR_ENHANCED_WARNINGS OFF) diff --git a/runtime/zip/DoxygenSupport.txt b/runtime/zip/DoxygenSupport.txt index 27d613395af..bcc6b233794 100644 --- a/runtime/zip/DoxygenSupport.txt +++ b/runtime/zip/DoxygenSupport.txt @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/runtime/zip/module.xml b/runtime/zip/module.xml index bfcc8fd19a6..a1508e91aa0 100644 --- a/runtime/zip/module.xml +++ b/runtime/zip/module.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/runtime/zip/zcpool.c b/runtime/zip/zcpool.c index 5d743027c53..4d655c9dc5b 100644 --- a/runtime/zip/zcpool.c +++ b/runtime/zip/zcpool.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/zip/zip_internal.h b/runtime/zip/zip_internal.h index d5272ede3a5..cd1d8458982 100644 --- a/runtime/zip/zip_internal.h +++ b/runtime/zip/zip_internal.h @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #ifndef zip_internal_h diff --git a/runtime/zip/zipalloc.c b/runtime/zip/zipalloc.c index cbcf8e0446e..84b5bc9c256 100644 --- a/runtime/zip/zipalloc.c +++ b/runtime/zip/zipalloc.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ #include "j9port.h" diff --git a/runtime/zip/zipcache.c b/runtime/zip/zipcache.c index 41db7b2f772..4e14a6045b3 100644 --- a/runtime/zip/zipcache.c +++ b/runtime/zip/zipcache.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/zip/zipsup.c b/runtime/zip/zipsup.c index 4d813e7ab83..8a454ea90f7 100644 --- a/runtime/zip/zipsup.c +++ b/runtime/zip/zipsup.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/runtime/zlib/CMakeLists.txt b/runtime/zlib/CMakeLists.txt index 68ee6e0f1bd..12e6dfe28c4 100644 --- a/runtime/zlib/CMakeLists.txt +++ b/runtime/zlib/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ j9vm_add_library(j9zlib SHARED diff --git a/runtime/zlib/about.html b/runtime/zlib/about.html index 3ce2441e827..386c74138a9 100644 --- a/runtime/zlib/about.html +++ b/runtime/zlib/about.html @@ -23,7 +23,7 @@

License

[1] https://www.gnu.org/software/classpath/license.html
[2] https://openjdk.org/legal/assembly-exception.html

-SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by diff --git a/runtime/zlinux-machine-speeds.txt b/runtime/zlinux-machine-speeds.txt index 7a198e9c64a..0dd7c8da99f 100644 --- a/runtime/zlinux-machine-speeds.txt +++ b/runtime/zlinux-machine-speeds.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # EC12 2827=5500 diff --git a/sourcetools/.classpath b/sourcetools/.classpath index 2dee218ee15..8717baaea8e 100644 --- a/sourcetools/.classpath +++ b/sourcetools/.classpath @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/sourcetools/.gitignore b/sourcetools/.gitignore index 56a19ef7cb4..66cf6f07577 100644 --- a/sourcetools/.gitignore +++ b/sourcetools/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /bin/ /.project diff --git a/sourcetools/CMakeLists.txt b/sourcetools/CMakeLists.txt index 12c6a0ec5d5..954076c10f7 100644 --- a/sourcetools/CMakeLists.txt +++ b/sourcetools/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # set JAVA_HOME to guide FindJava diff --git a/sourcetools/JCL_Ant_Build/.gitignore b/sourcetools/JCL_Ant_Build/.gitignore index ad3126a00a0..609ed1773dd 100644 --- a/sourcetools/JCL_Ant_Build/.gitignore +++ b/sourcetools/JCL_Ant_Build/.gitignore @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /bin/ diff --git a/sourcetools/JCL_Ant_Build/symlink_jcl.xml b/sourcetools/JCL_Ant_Build/symlink_jcl.xml index 96621a12e9d..99b1fda665a 100644 --- a/sourcetools/JCL_Ant_Build/symlink_jcl.xml +++ b/sourcetools/JCL_Ant_Build/symlink_jcl.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Creates symlinks between diff --git a/sourcetools/buildj9tools.mk b/sourcetools/buildj9tools.mk index afd5e344e5f..6c1069b8b29 100644 --- a/sourcetools/buildj9tools.mk +++ b/sourcetools/buildj9tools.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # ################################################################################ # Makefile to compile and archive the J9 Java tools. diff --git a/sourcetools/com.ibm.admincache/build.xml b/sourcetools/com.ibm.admincache/build.xml index 425fa56109d..e6729749ab7 100644 --- a/sourcetools/com.ibm.admincache/build.xml +++ b/sourcetools/com.ibm.admincache/build.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/sourcetools/com.ibm.admincache/how-to-update.txt b/sourcetools/com.ibm.admincache/how-to-update.txt index 5c4e2720f83..2eff4cf0c0f 100644 --- a/sourcetools/com.ibm.admincache/how-to-update.txt +++ b/sourcetools/com.ibm.admincache/how-to-update.txt @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Steps for updating admincache.jar and committing it: diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/CaptureThread.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/CaptureThread.java index 118e03782ea..0923ce2d74e 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/CaptureThread.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/CaptureThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Config.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Config.java index 60e4db4307e..8544407ae86 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Config.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Config.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarFinder.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarFinder.java index 8a6bbd38854..7046cf0cea0 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarFinder.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarFinder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarPersister.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarPersister.java index 0fe917724e3..0a4a92f46d7 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarPersister.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/JarPersister.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Main.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Main.java index 1fa86934eb0..0ea8ff45846 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Main.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Record.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Record.java index 2fba5d48bc7..e4d9d5743c1 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Record.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/Record.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.admincache; diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCacheConfig.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCacheConfig.java index 3b7171bbe06..4259f3d3c44 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCacheConfig.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCacheConfig.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCachePersister.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCachePersister.java index e945a7ce639..4b08c87bbc5 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCachePersister.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/SharedCachePersister.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/ZipClassLoader.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/ZipClassLoader.java index d7e7a3df2da..69fe5084dbe 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/ZipClassLoader.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/ZipClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.admincache; diff --git a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/admincache.java b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/admincache.java index 199b8f01baf..72d95658631 100644 --- a/sourcetools/com.ibm.admincache/src/com/ibm/admincache/admincache.java +++ b/sourcetools/com.ibm.admincache/src/com/ibm/admincache/admincache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineBuilder.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineBuilder.java index e33dea5c7e5..ddc82cfac4f 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineBuilder.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineBuilder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.commandline; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineLogger.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineLogger.java index d99fe8abc92..c1ea17266fc 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineLogger.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineLogger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.commandline; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineNowarnLogger.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineNowarnLogger.java index 8f66225a5ef..1119179033f 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineNowarnLogger.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/CommandlineNowarnLogger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.commandline; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/NullOutputStream.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/NullOutputStream.java index 3cfe05416c7..72779bf41f6 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/NullOutputStream.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/commandline/NullOutputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.commandline; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Builder.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Builder.java index 96a355b78a9..f3704b061b5 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Builder.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Builder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderConfigurationException.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderConfigurationException.java index a1ec94d4250..51e9a544aa4 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderConfigurationException.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderConfigurationException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderExtension.java index 87f6ae1107b..92c9cbf342f 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/BuilderExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ClassPathEntry.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ClassPathEntry.java index 8440cde90c4..463fee7baf5 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ClassPathEntry.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ClassPathEntry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigObject.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigObject.java index b2326c8541b..e43872b7f74 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigObject.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigXMLHandler.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigXMLHandler.java index ab08f6ae262..bd927d58c74 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigXMLHandler.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigXMLHandler.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigurationRegistry.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigurationRegistry.java index 1afc17ffa4f..283ab535ae8 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigurationRegistry.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ConfigurationRegistry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/EclipseMetadataExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/EclipseMetadataExtension.java index 98004121294..9acd557f48b 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/EclipseMetadataExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/EclipseMetadataExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ExternalMessagesExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ExternalMessagesExtension.java index 5f332d2b64d..69d724f2ae2 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ExternalMessagesExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/ExternalMessagesExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; @@ -223,7 +223,7 @@ private void writeMessages() { put.println("# [1] https://www.gnu.org/software/classpath/license.html"); put.println("# [2] https://openjdk.org/legal/assembly-exception.html"); put.println("#"); - put.println("# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception"); + put.println("# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0"); put.println("#"); put.println("# External Messages for EN locale"); Set> entries = messages.entrySet(); diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JavaPreprocessor.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JavaPreprocessor.java index ad5f4cfcfde..31083407597 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JavaPreprocessor.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JavaPreprocessor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributes.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributes.java index 908c5e3bb08..270a93ee4ff 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributes.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributes.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributesExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributesExtension.java index 5818cbe84c8..213b14560ec 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributesExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JitAttributesExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JxeRulesExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JxeRulesExtension.java index edfd0ca8f66..0de196ab71b 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JxeRulesExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/JxeRulesExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Logger.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Logger.java index f15c8ac1491..14c57e2fcca 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Logger.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Logger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MacroExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MacroExtension.java index 185420aa404..70350a57368 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MacroExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MacroExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MetaRegistry.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MetaRegistry.java index 45cd948c0bb..301c45d8df6 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MetaRegistry.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/MetaRegistry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/NullLogger.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/NullLogger.java index ab75c1b1f98..7a2a151449a 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/NullLogger.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/NullLogger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PhantomOutputStream.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PhantomOutputStream.java index 9d41791c11a..2df840e2b44 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PhantomOutputStream.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PhantomOutputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorException.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorException.java index 8b1a48bb812..069f0a446e2 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorException.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorFactory.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorFactory.java index 499edf1ed2f..03aabde3de3 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorFactory.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorWarning.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorWarning.java index 5505a996f36..d9077787394 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorWarning.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/PreprocessorWarning.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/SimpleCopy.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/SimpleCopy.java index 31749f05fef..13eb6937d8f 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/SimpleCopy.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/SimpleCopy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Src.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Src.java index 0899a86fb43..3c566cc70d3 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Src.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/Src.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TagExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TagExtension.java index a12cdeb00ed..381d4baa4de 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TagExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TagExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TestsProjectExtension.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TestsProjectExtension.java index f325360224c..c2cfee5345a 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TestsProjectExtension.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/om/TestsProjectExtension.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.om; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/IXMLDocumentHandler.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/IXMLDocumentHandler.java index 2bde0eee990..6b1414c1362 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/IXMLDocumentHandler.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/IXMLDocumentHandler.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.xml; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLException.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLException.java index 37a64919f64..dcfbd4b4f62 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLException.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.xml; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLParser.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLParser.java index ddec49e8715..54311d576ad 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLParser.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.xml; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLSpec.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLSpec.java index f5c47bb693c..ab141762c3b 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLSpec.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLSpec.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.xml; diff --git a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLStringBuffer.java b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLStringBuffer.java index 0101835bb16..85b2ff06801 100644 --- a/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLStringBuffer.java +++ b/sourcetools/com.ibm.jpp.preprocessor/com/ibm/jpp/xml/XMLStringBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jpp.xml; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/Main.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/Main.java index 8b79a08e346..f0368320d36 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/Main.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/ConfigurationImpl.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/ConfigurationImpl.java index 31ce8efbf25..fce9ea98201 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/ConfigurationImpl.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/ConfigurationImpl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration; @@ -342,7 +342,7 @@ public String getMakefileCopyrightNotice() throws UMAException { "# [1] https://www.gnu.org/software/classpath/license.html\n" + "# [2] https://openjdk.org/legal/assembly-exception.html\n" + "#\n" + - "# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception\n" + + "# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0\n" + "\n" + "# File generated in stream: " + majorVersion + "." + minorVersion + "\n" + "#\n" + @@ -374,7 +374,7 @@ public String getcCopyrightNotice() throws UMAException { " * [1] https://www.gnu.org/software/classpath/license.html\n" + " * [2] https://openjdk.org/legal/assembly-exception.html\n" + " *\n" + - " * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception\n" + + " * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0\n" + " */\n"; } return cCopyrightNotice; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/BuildInfo.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/BuildInfo.java index f0cd0a008c0..4c1099ff3ef 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/BuildInfo.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/BuildInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/DefaultSizes.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/DefaultSizes.java index 719f91119cd..5dc995a2e68 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/DefaultSizes.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/DefaultSizes.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Feature.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Feature.java index 963e9cb465d..23db7bf6cd3 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Feature.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Feature.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Features.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Features.java index 4dda49d2cf7..61a63151405 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Features.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Features.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Flag.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Flag.java index 5447be485e7..2384e5b3580 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Flag.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Flag.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoot.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoot.java index fe07b617f6d..0030555a0a8 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoot.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoot.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoots.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoots.java index 94a3815d24f..8cc6ff9e15a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoots.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/FsRoots.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Project.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Project.java index c8cd968292e..66a5c466c96 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Project.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Project.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/PropertiesIterator.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/PropertiesIterator.java index f2d2e4f5b62..0029b32e02d 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/PropertiesIterator.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/PropertiesIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/RepositoryBranch.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/RepositoryBranch.java index 0770aaaf661..f06814ee703 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/RepositoryBranch.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/RepositoryBranch.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SimpleSpec.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SimpleSpec.java index 9c4295c4579..c8306e85785 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SimpleSpec.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SimpleSpec.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Size.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Size.java index 3bedec019f8..c6ec5b6b414 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Size.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Size.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Source.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Source.java index 1607c94b1ad..1954bb84948 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Source.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Source.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SourceControl.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SourceControl.java index d88f36e8be9..b42bc4c3042 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SourceControl.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/SourceControl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Version.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Version.java index e8544f48acc..7b8b4004ea1 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Version.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/configuration/freemarker/Version.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.configuration.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformImplementation.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformImplementation.java index fe8ddd6a548..5ad730b439a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformImplementation.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformImplementation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.platform; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformOSX.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformOSX.java index c06e3fc8c82..8bee134acb1 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformOSX.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformOSX.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.platform; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformUnix.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformUnix.java index ce84f75b0ac..672e4e9c463 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformUnix.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformUnix.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.platform; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java index 20e7e677c67..54e86ca852c 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.platform; diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformZOS.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformZOS.java index 00379edd3a8..7ef604bc9e1 100644 --- a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformZOS.java +++ b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformZOS.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.uma.platform; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/DuplicateArtifactKeyException.java b/sourcetools/com.ibm.uma/com/ibm/uma/DuplicateArtifactKeyException.java index 7940d0dcec4..0a6c3b7e418 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/DuplicateArtifactKeyException.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/DuplicateArtifactKeyException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/IConfiguration.java b/sourcetools/com.ibm.uma/com/ibm/uma/IConfiguration.java index 3eae42aab76..01fd40196f5 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/IConfiguration.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/IConfiguration.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/IPlatform.java b/sourcetools/com.ibm.uma/com/ibm/uma/IPlatform.java index e8e319560c1..8d555a2bc7f 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/IPlatform.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/IPlatform.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/ISinglePredicateEvaluator.java b/sourcetools/com.ibm.uma/com/ibm/uma/ISinglePredicateEvaluator.java index c8fd0fdef5c..c26a62a8180 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/ISinglePredicateEvaluator.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/ISinglePredicateEvaluator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/UMA.java b/sourcetools/com.ibm.uma/com/ibm/uma/UMA.java index dcfb0514ce9..4ffc28d35c1 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/UMA.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/UMA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; import java.io.File; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/UMABadPhaseNameException.java b/sourcetools/com.ibm.uma/com/ibm/uma/UMABadPhaseNameException.java index dcf6291f131..f7b81eaca2b 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/UMABadPhaseNameException.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/UMABadPhaseNameException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/UMAException.java b/sourcetools/com.ibm.uma/com/ibm/uma/UMAException.java index 5131e032c13..f7873650540 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/UMAException.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/UMAException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifact.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifact.java index cc333554b20..665b84eb8ea 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifact.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifact.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactData.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactData.java index 6d2b085d7aa..a934c21effa 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactData.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactDataElement.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactDataElement.java index 5c0e73302a8..b837c51181f 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactDataElement.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactDataElement.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactName.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactName.java index 6179b92b9c6..cf1d933958c 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactName.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ArtifactName.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifacts.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifacts.java index 0b419ac3afb..00350b143e7 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifacts.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Artifacts.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Export.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Export.java index e2bd74382fe..147da32cd9b 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Export.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Export.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ExportNames.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ExportNames.java index 178d0654076..e58c5101a8e 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ExportNames.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/ExportNames.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flag.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flag.java index 7324b25f5bd..cf382ef4b73 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flag.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flag.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flags.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flags.java index 5ff32c98ac3..02baf7cfe12 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flags.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Flags.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Processor.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Processor.java index 76eac97283f..89a855280b9 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Processor.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Processor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Properties.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Properties.java index 887e6c98d1c..8cb2122a703 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Properties.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Properties.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Property.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Property.java index 82d4844a066..1d6da313ea8 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Property.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Property.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Spec.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Spec.java index f76d669cc5a..f43e7c80ef7 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Spec.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Spec.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/TemplateLoader.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/TemplateLoader.java index 0772594baa6..3e3b6dbc40d 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/TemplateLoader.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/TemplateLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tool.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tool.java index adb4b569695..79a2c88f0d9 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tool.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tool.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tools.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tools.java index 9adb17e0309..809b823773a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tools.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Tools.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Type.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Type.java index f991513d9be..d76deac662c 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Type.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/Type.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/UMA.java b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/UMA.java index f5e5dac09ad..ed8f87f9d54 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/UMA.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/freemarker/UMA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.freemarker; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Artifact.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Artifact.java index c3a11ec2191..94ce5c5dfea 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Artifact.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Artifact.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; import java.util.Hashtable; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Command.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Command.java index d5d1b2e6d77..80d3996b1cc 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Command.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Command.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Dependency.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Dependency.java index 8bc71efca2d..2ae0a6f0d3a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Dependency.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Dependency.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Export.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Export.java index dc050e60759..7553af493b0 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Export.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Export.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Exports.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Exports.java index 320a58378f9..ed34b33af38 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Exports.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Exports.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Flag.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Flag.java index ccbb887190e..5e2eebca368 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Flag.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Flag.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Flags.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Flags.java index 8fef71e3725..129732a2913 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Flags.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Flags.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Include.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Include.java index a9f3898a791..c0908d4020a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Include.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Include.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Library.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Library.java index a0ca857ee78..f8f3185bdb8 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Library.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Library.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/MakefileStub.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/MakefileStub.java index 0ef88c690b3..7e07c72df80 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/MakefileStub.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/MakefileStub.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Module.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Module.java index eb19b534360..759b96e8b31 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Module.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Module.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; import java.util.Hashtable; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Object.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Object.java index 3c45423a5fe..e7a500beb7f 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Object.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Object.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Objects.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Objects.java index c395744671a..2d6f41ccde1 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Objects.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Objects.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Option.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Option.java index bb305a3860f..412e14ec80e 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Option.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Option.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/Predicate.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/Predicate.java index 3dc60986131..ee60fe76a11 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/Predicate.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/Predicate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/PredicateList.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/PredicateList.java index 698e55fb3c0..ae569c5ad38 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/PredicateList.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/PredicateList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/SubdirArtifact.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/SubdirArtifact.java index 3fd763c6952..8b3845a44c7 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/SubdirArtifact.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/SubdirArtifact.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/VPath.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/VPath.java index 1f5fe10827b..8446198ebd8 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/VPath.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/VPath.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ArtifactParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ArtifactParser.java index eea2c5f5ecf..cec1ecc40eb 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ArtifactParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ArtifactParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportParser.java index c1664351864..c8f9e521a6a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportlistsParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportlistsParser.java index a8890babf85..9ba6c578306 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportlistsParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportlistsParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportsParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportsParser.java index 16c20159c7a..25496457b53 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportsParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ExportsParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagParser.java index 5c5f2be59c1..adc6482fce7 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlaglistsParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlaglistsParser.java index 7e51552e032..d39c7fc1246 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlaglistsParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlaglistsParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagsParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagsParser.java index a7d53725a0f..6107ea380f2 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagsParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/FlagsParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/LibraryParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/LibraryParser.java index 37255ce29a1..604ed786e7a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/LibraryParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/LibraryParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ModuleParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ModuleParser.java index fd53e173915..d941567ba4b 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ModuleParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ModuleParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectParser.java index 7c1510bd39e..3ccf78009b6 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectlistsParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectlistsParser.java index bcb281ebbda..b5bd52bdd67 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectlistsParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectlistsParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectsParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectsParser.java index c0c95d66263..16c854ce331 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectsParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ObjectsParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/OptionParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/OptionParser.java index 9e5c14b9376..41c49378b60 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/OptionParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/OptionParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/Parser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/Parser.java index 325108bbdf3..50cbd14f22a 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/Parser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/Parser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ParserErrorHandler.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ParserErrorHandler.java index dcf96d8a7f3..84b07185637 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ParserErrorHandler.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/ParserErrorHandler.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/VPathParser.java b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/VPathParser.java index f4cd8b98094..dff734238db 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/VPathParser.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/VPathParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.om.parser; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/module.xsd b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/module.xsd index ae81f7b3b82..62ee3b84c23 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/module.xsd +++ b/sourcetools/com.ibm.uma/com/ibm/uma/om/parser/module.xsd @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/util/FileAssistant.java b/sourcetools/com.ibm.uma/com/ibm/uma/util/FileAssistant.java index b96cc9dcd9f..739562d9f4f 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/util/FileAssistant.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/util/FileAssistant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.util; diff --git a/sourcetools/com.ibm.uma/com/ibm/uma/util/Logger.java b/sourcetools/com.ibm.uma/com/ibm/uma/util/Logger.java index bc8f3ab4fd1..8f5064e6175 100644 --- a/sourcetools/com.ibm.uma/com/ibm/uma/util/Logger.java +++ b/sourcetools/com.ibm.uma/com/ibm/uma/util/Logger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.uma.util; diff --git a/sourcetools/j9constantpool/CMakeLists.txt b/sourcetools/j9constantpool/CMakeLists.txt index 94430b53021..dbae75d6eec 100644 --- a/sourcetools/j9constantpool/CMakeLists.txt +++ b/sourcetools/j9constantpool/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ # CMake uses ':' as the path separator when building in cygwin which isn't diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ClassRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ClassRef.java index 94f71408115..d0f721b430f 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ClassRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ClassRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/CmakeFlagInfo.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/CmakeFlagInfo.java index 88fa308566d..b0f1bb314bc 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/CmakeFlagInfo.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/CmakeFlagInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPool.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPool.java index 17eb8e8b2ad..1918e22fff8 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPool.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPool.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolItem.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolItem.java index 6aa66ed7476..33cd8818a6b 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolItem.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolItem.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolStream.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolStream.java index f9a9aa2aede..f2ea52cef0e 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolStream.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/ConstantPoolStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Constants.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Constants.java index b935fc56870..f4a6c3556ec 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Constants.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Constants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/FieldRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/FieldRef.java index b608267d861..d3edd6cff65 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/FieldRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/FieldRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/IFlagInfo.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/IFlagInfo.java index 876c1bc133f..91d995903cc 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/IFlagInfo.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/IFlagInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/InterfaceMethodRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/InterfaceMethodRef.java index 594ee256dea..0de5b168f0d 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/InterfaceMethodRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/InterfaceMethodRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/J9UTF8.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/J9UTF8.java index e013316be9c..51451f4d080 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/J9UTF8.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/J9UTF8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Main.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Main.java index 7bc5f0426a0..bb500a35d38 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Main.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/NameAndSignature.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/NameAndSignature.java index f4689cb3a5d..e08505713b8 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/NameAndSignature.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/NameAndSignature.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/PrimaryItem.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/PrimaryItem.java index 67dba7f1c95..06955f9852e 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/PrimaryItem.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/PrimaryItem.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/SpecialMethodRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/SpecialMethodRef.java index d69c75fd0cb..26050f5d9d1 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/SpecialMethodRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/SpecialMethodRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticFieldRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticFieldRef.java index 0293f4ef484..d5c67dd67df 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticFieldRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticFieldRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticMethodRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticMethodRef.java index 999f6c790f0..9a0951da8f3 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticMethodRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/StaticMethodRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/UmaFlagInfo.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/UmaFlagInfo.java index 8becaa89d6b..a3b94f01198 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/UmaFlagInfo.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/UmaFlagInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Util.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Util.java index 311a8f77623..e0e4c7fcc28 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Util.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/Util.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/VirtualMethodRef.java b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/VirtualMethodRef.java index 0b6cc5165bd..c9e81b6fd16 100644 --- a/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/VirtualMethodRef.java +++ b/sourcetools/j9constantpool/com/ibm/oti/VMCPTool/VirtualMethodRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.VMCPTool; diff --git a/sourcetools/j9nls.jardesc b/sourcetools/j9nls.jardesc index ca8e816878e..cdd678ca324 100644 --- a/sourcetools/j9nls.jardesc +++ b/sourcetools/j9nls.jardesc @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/sourcetools/j9nls/CMakeLists.txt b/sourcetools/j9nls/CMakeLists.txt index 4ed197a22d6..c308a07f6d7 100644 --- a/sourcetools/j9nls/CMakeLists.txt +++ b/sourcetools/j9nls/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_jar(j9nls diff --git a/sourcetools/j9nls/com/ibm/oti/NLSTool/J9NLS.java b/sourcetools/j9nls/com/ibm/oti/NLSTool/J9NLS.java index 2077313dc2b..8d1b760b86a 100644 --- a/sourcetools/j9nls/com/ibm/oti/NLSTool/J9NLS.java +++ b/sourcetools/j9nls/com/ibm/oti/NLSTool/J9NLS.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.NLSTool; @@ -794,7 +794,7 @@ public void writeHeader(String headerName, String moduleName) { append(" * [1] https://www.gnu.org/software/classpath/license.html\n"); append(" * [2] https://openjdk.org/legal/assembly-exception.html\n"); append(" *\n"); - append(" * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception\n"); + append(" * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0\n"); append(" */\n\n"); append("#ifndef " + header + "\n"); append("#define " + header + "\n\n"); diff --git a/sourcetools/j9nls/com/ibm/oti/NLSTool/J9ReverseNLS.java b/sourcetools/j9nls/com/ibm/oti/NLSTool/J9ReverseNLS.java index db094f3ce0b..809d00dd386 100644 --- a/sourcetools/j9nls/com/ibm/oti/NLSTool/J9ReverseNLS.java +++ b/sourcetools/j9nls/com/ibm/oti/NLSTool/J9ReverseNLS.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.NLSTool; diff --git a/sourcetools/j9nls/com/ibm/oti/NLSTool/MsgInfo.java b/sourcetools/j9nls/com/ibm/oti/NLSTool/MsgInfo.java index 92247afa34a..6494dc30d03 100644 --- a/sourcetools/j9nls/com/ibm/oti/NLSTool/MsgInfo.java +++ b/sourcetools/j9nls/com/ibm/oti/NLSTool/MsgInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.NLSTool; diff --git a/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSConstants.java b/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSConstants.java index 4c559ade9c0..aa2344b56b9 100644 --- a/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSConstants.java +++ b/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSConstants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.NLSTool; diff --git a/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSHtmlGenerator.java b/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSHtmlGenerator.java index 830b413c491..0cfb091f491 100644 --- a/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSHtmlGenerator.java +++ b/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSHtmlGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.NLSTool; diff --git a/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSInfo.java b/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSInfo.java index 9e0c8cb048e..a31a3d6c99e 100644 --- a/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSInfo.java +++ b/sourcetools/j9nls/com/ibm/oti/NLSTool/NLSInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.NLSTool; diff --git a/sourcetools/j9vmcp.jardesc b/sourcetools/j9vmcp.jardesc index 5834990ed3e..203b06d6271 100644 --- a/sourcetools/j9vmcp.jardesc +++ b/sourcetools/j9vmcp.jardesc @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/sourcetools/objectmodel/CMakeLists.txt b/sourcetools/objectmodel/CMakeLists.txt index c1fd9a2a184..3ba9db68e50 100644 --- a/sourcetools/objectmodel/CMakeLists.txt +++ b/sourcetools/objectmodel/CMakeLists.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ################################################################################ add_jar(objectmodel diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/AsmBuilder.java b/sourcetools/objectmodel/com/ibm/j9tools/om/AsmBuilder.java index cec1009258e..6137080ed90 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/AsmBuilder.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/AsmBuilder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/BuildInfo.java b/sourcetools/objectmodel/com/ibm/j9tools/om/BuildInfo.java index 5361f590e6b..6105e164be2 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/BuildInfo.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/BuildInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/BuildSpec.java b/sourcetools/objectmodel/com/ibm/j9tools/om/BuildSpec.java index bfd4afb4147..42622fd63d8 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/BuildSpec.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/BuildSpec.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/ConfigDirectory.java b/sourcetools/objectmodel/com/ibm/j9tools/om/ConfigDirectory.java index 720d67d4e48..1e0300f9e04 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/ConfigDirectory.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/ConfigDirectory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/DefaultSizes.java b/sourcetools/objectmodel/com/ibm/j9tools/om/DefaultSizes.java index 85daf09d2ab..3d0bda95b61 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/DefaultSizes.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/DefaultSizes.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/Feature.java b/sourcetools/objectmodel/com/ibm/j9tools/om/Feature.java index 2a14739776d..b5d63f0c5b0 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/Feature.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/Feature.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/FeatureDefinition.java b/sourcetools/objectmodel/com/ibm/j9tools/om/FeatureDefinition.java index eb9cf91e2c4..8a57b1b2677 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/FeatureDefinition.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/FeatureDefinition.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/Flag.java b/sourcetools/objectmodel/com/ibm/j9tools/om/Flag.java index 6333c0395e0..077f8f8b8d3 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/Flag.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/Flag.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinition.java b/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinition.java index 9a488bae827..c73dd7cd3b9 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinition.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinition.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinitions.java b/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinitions.java index 62d9c1069e5..e222f3da2a2 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinitions.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/FlagDefinitions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/FlagVerifier.java b/sourcetools/objectmodel/com/ibm/j9tools/om/FlagVerifier.java index b2b00af28d5..5b324f07b0a 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/FlagVerifier.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/FlagVerifier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/IFlagContainer.java b/sourcetools/objectmodel/com/ibm/j9tools/om/IFlagContainer.java index bf132cdd442..fa198ee9055 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/IFlagContainer.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/IFlagContainer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/ISourceContainer.java b/sourcetools/objectmodel/com/ibm/j9tools/om/ISourceContainer.java index ac0e2c1488a..a598251e17e 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/ISourceContainer.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/ISourceContainer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidAsmBuilderException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidAsmBuilderException.java index f32d35b9128..10768db9ac0 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidAsmBuilderException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidAsmBuilderException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildInfoException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildInfoException.java index 1186f1c3bcc..253459e4c3b 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildInfoException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildInfoException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildSpecException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildSpecException.java index 9c7a11e8f1f..d8b6eb7b656 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildSpecException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidBuildSpecException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidConfigurationException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidConfigurationException.java index fe35b018209..549bf81b2f9 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidConfigurationException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidConfigurationException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidDefaultSizesException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidDefaultSizesException.java index 6599b007cba..8f4872f79ea 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidDefaultSizesException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidDefaultSizesException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFactoryException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFactoryException.java index 7b2f4a92200..8fb5900b888 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFactoryException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFactoryException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureDefinitionException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureDefinitionException.java index 380c1b7210e..36630b6a0cd 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureDefinitionException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureDefinitionException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureException.java index 5ecf7389dec..7664fdaf049 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFeatureException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagDefinitionsException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagDefinitionsException.java index 38d3772409b..90ea18d3435 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagDefinitionsException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagDefinitionsException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagException.java index f8665fddd0b..f7e57ec2202 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidFlagException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidJCLException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidJCLException.java index 6de3388960e..dbd674d01e9 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidJCLException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidJCLException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSourceException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSourceException.java index 4c5dd30cd2a..488a92e5bfc 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSourceException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSourceException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSpecIDException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSpecIDException.java index 6b65e94043c..105b4002607 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSpecIDException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/InvalidSpecIDException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/JclConfiguration.java b/sourcetools/objectmodel/com/ibm/j9tools/om/JclConfiguration.java index c26f0cb9bb3..3c6108990f9 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/JclConfiguration.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/JclConfiguration.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/Messages.java b/sourcetools/objectmodel/com/ibm/j9tools/om/Messages.java index 25d31a281df..9bb6358a9af 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/Messages.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/Messages.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/MissingPropertyException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/MissingPropertyException.java index 63f0d9a961b..f36835fa1b7 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/MissingPropertyException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/MissingPropertyException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/OMElementException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/OMElementException.java index a4b6544677a..3e3216e13a2 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/OMElementException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/OMElementException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/OMException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/OMException.java index ec8c584af33..e30fa88dc47 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/OMException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/OMException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/OMObject.java b/sourcetools/objectmodel/com/ibm/j9tools/om/OMObject.java index add5f3b1805..f87d169bfc1 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/OMObject.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/OMObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/OMObjectException.java b/sourcetools/objectmodel/com/ibm/j9tools/om/OMObjectException.java index c6dffef16b5..20e1c12dcbc 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/OMObjectException.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/OMObjectException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/ObjectFactory.java b/sourcetools/objectmodel/com/ibm/j9tools/om/ObjectFactory.java index 74093b3717f..ac4e6f45d23 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/ObjectFactory.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/ObjectFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/Owner.java b/sourcetools/objectmodel/com/ibm/j9tools/om/Owner.java index f90afbba812..58d2dd78e43 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/Owner.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/Owner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/Property.java b/sourcetools/objectmodel/com/ibm/j9tools/om/Property.java index 6efb93fc7ab..564942898e7 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/Property.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/Property.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/Source.java b/sourcetools/objectmodel/com/ibm/j9tools/om/Source.java index 3ed426fbc54..fe6913a6d94 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/Source.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/Source.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/SourceLocation.java b/sourcetools/objectmodel/com/ibm/j9tools/om/SourceLocation.java index d6f25c914ad..61a3c00d1db 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/SourceLocation.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/SourceLocation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/SourceVerifier.java b/sourcetools/objectmodel/com/ibm/j9tools/om/SourceVerifier.java index 58f69595fe3..15c0807b4d9 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/SourceVerifier.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/SourceVerifier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/AbstractParser.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/AbstractParser.java index 1eeeab25152..e2c476bdc00 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/AbstractParser.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/AbstractParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildInfoParser.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildInfoParser.java index daebeb818ad..c17cf681d33 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildInfoParser.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildInfoParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildSpecParser.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildSpecParser.java index 0dd0278d3d5..3709cf4013e 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildSpecParser.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/BuildSpecParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/FeatureParser.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/FeatureParser.java index 1903f71b000..1f537891f86 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/FeatureParser.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/FeatureParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/FileExtensionFilter.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/FileExtensionFilter.java index 46945e04f17..026b4a61394 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/FileExtensionFilter.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/FileExtensionFilter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/FlagDefinitionParser.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/FlagDefinitionParser.java index e2e3bbe1f5c..02649751207 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/FlagDefinitionParser.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/FlagDefinitionParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/com/ibm/j9tools/om/io/Messages.java b/sourcetools/objectmodel/com/ibm/j9tools/om/io/Messages.java index 3cfbb51eb14..00415e2387e 100644 --- a/sourcetools/objectmodel/com/ibm/j9tools/om/io/Messages.java +++ b/sourcetools/objectmodel/com/ibm/j9tools/om/io/Messages.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9tools.om.io; diff --git a/sourcetools/objectmodel/schema/archive-v1.xsd b/sourcetools/objectmodel/schema/archive-v1.xsd index d195d6e96f5..23dfc891309 100644 --- a/sourcetools/objectmodel/schema/archive-v1.xsd +++ b/sourcetools/objectmodel/schema/archive-v1.xsd @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/.gitignore b/test/.gitignore index 0f41530dd1e..f2a6ec1cbdd 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # java .class files *.class diff --git a/test/README.md b/test/README.md index d5587a75a4a..f52a289259b 100644 --- a/test/README.md +++ b/test/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Quick Start diff --git a/test/TestConfig/build.xml b/test/TestConfig/build.xml index 68e345b77ec..333c9912ac3 100644 --- a/test/TestConfig/build.xml +++ b/test/TestConfig/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/TestConfig/resources/excludes/feature_ojdkmh_exclude.txt b/test/TestConfig/resources/excludes/feature_ojdkmh_exclude.txt index c4da8c59fa2..1e3fc3b3765 100644 --- a/test/TestConfig/resources/excludes/feature_ojdkmh_exclude.txt +++ b/test/TestConfig/resources/excludes/feature_ojdkmh_exclude.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/feature_vtstandard_exclude.txt b/test/TestConfig/resources/excludes/feature_vtstandard_exclude.txt index f85913ea52d..c2680c3cdaf 100644 --- a/test/TestConfig/resources/excludes/feature_vtstandard_exclude.txt +++ b/test/TestConfig/resources/excludes/feature_vtstandard_exclude.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_11.txt b/test/TestConfig/resources/excludes/latest_exclude_11.txt index 34b16898f49..8f652bbbf99 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_11.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_11.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_16.txt b/test/TestConfig/resources/excludes/latest_exclude_16.txt index 65a228af0f2..feeb492b24a 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_16.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_16.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_17.txt b/test/TestConfig/resources/excludes/latest_exclude_17.txt index 65a228af0f2..feeb492b24a 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_17.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_17.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_18.txt b/test/TestConfig/resources/excludes/latest_exclude_18.txt index 4e4b171fe87..3176e3763b2 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_18.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_18.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_19.txt b/test/TestConfig/resources/excludes/latest_exclude_19.txt index 04420b2382c..a91d24039a0 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_19.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_19.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_20.txt b/test/TestConfig/resources/excludes/latest_exclude_20.txt index 2910e612fa1..8e7e71296d1 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_20.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_20.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_21.txt b/test/TestConfig/resources/excludes/latest_exclude_21.txt index d0799f28b17..8d3b462d32e 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_21.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_21.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_8.txt b/test/TestConfig/resources/excludes/latest_exclude_8.txt index a24749874ff..0839d9747cf 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_8.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_8.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/excludes/latest_exclude_base.txt b/test/TestConfig/resources/excludes/latest_exclude_base.txt index e718f04c264..0b9bc6a779e 100644 --- a/test/TestConfig/resources/excludes/latest_exclude_base.txt +++ b/test/TestConfig/resources/excludes/latest_exclude_base.txt @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # Exclude tests temporarily diff --git a/test/TestConfig/resources/log4testng.properties b/test/TestConfig/resources/log4testng.properties index db5c0e546a5..a5727bf37c3 100644 --- a/test/TestConfig/resources/log4testng.properties +++ b/test/TestConfig/resources/log4testng.properties @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # TestNG support logging via a custom logging framework similar to Log4j. diff --git a/test/TestConfig/scripts/tools/sysvcleanup.pl b/test/TestConfig/scripts/tools/sysvcleanup.pl index d429db45bfc..07bbf2dd78a 100644 --- a/test/TestConfig/scripts/tools/sysvcleanup.pl +++ b/test/TestConfig/scripts/tools/sysvcleanup.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## use strict; diff --git a/test/Utils/src/org/openj9/test/util/ExcludeData.java b/test/Utils/src/org/openj9/test/util/ExcludeData.java index b7c89d756d4..9f8c4c7ade1 100644 --- a/test/Utils/src/org/openj9/test/util/ExcludeData.java +++ b/test/Utils/src/org/openj9/test/util/ExcludeData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/Utils/src/org/openj9/test/util/IncludeExcludeTestAnnotationTransformer.java b/test/Utils/src/org/openj9/test/util/IncludeExcludeTestAnnotationTransformer.java index a5f37c6019e..cb715be1e3e 100644 --- a/test/Utils/src/org/openj9/test/util/IncludeExcludeTestAnnotationTransformer.java +++ b/test/Utils/src/org/openj9/test/util/IncludeExcludeTestAnnotationTransformer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/docs/DependentLibs.md b/test/docs/DependentLibs.md index 5ceeb558387..af91f14416e 100644 --- a/test/docs/DependentLibs.md +++ b/test/docs/DependentLibs.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # list of dependent libs diff --git a/test/docs/OpenJ9TestUserGuide.md b/test/docs/OpenJ9TestUserGuide.md index df643b4618d..62fb92e1c44 100644 --- a/test/docs/OpenJ9TestUserGuide.md +++ b/test/docs/OpenJ9TestUserGuide.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # How-to Run Tests diff --git a/test/docs/Prerequisites.md b/test/docs/Prerequisites.md index 7b310b08b85..0d645d812fd 100644 --- a/test/docs/Prerequisites.md +++ b/test/docs/Prerequisites.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Prerequisites: diff --git a/test/functional/CacheManagement/CacheManagement_win.xml b/test/functional/CacheManagement/CacheManagement_win.xml index 13cac29bbe8..a5e73bdfbff 100644 --- a/test/functional/CacheManagement/CacheManagement_win.xml +++ b/test/functional/CacheManagement/CacheManagement_win.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/CacheManagement/build.xml b/test/functional/CacheManagement/build.xml index 939205b558f..4bb23982816 100644 --- a/test/functional/CacheManagement/build.xml +++ b/test/functional/CacheManagement/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/CacheManagement/exclude.xml b/test/functional/CacheManagement/exclude.xml index 84b28ab8519..61dc57293db 100644 --- a/test/functional/CacheManagement/exclude.xml +++ b/test/functional/CacheManagement/exclude.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/CacheManagement/playlist.xml b/test/functional/CacheManagement/playlist.xml index 252122779ba..7952548daf3 100644 --- a/test/functional/CacheManagement/playlist.xml +++ b/test/functional/CacheManagement/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> CacheManagement.mk diff --git a/test/functional/CacheManagement/readme.txt b/test/functional/CacheManagement/readme.txt index f2b697aa049..0bcc50589d0 100644 --- a/test/functional/CacheManagement/readme.txt +++ b/test/functional/CacheManagement/readme.txt @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> This project contains an infrastructure and tests for exercising the shared classes command line options. diff --git a/test/functional/CacheManagement/src/Temp.java b/test/functional/CacheManagement/src/Temp.java index f2c57be792e..24302d4b25e 100644 --- a/test/functional/CacheManagement/src/Temp.java +++ b/test/functional/CacheManagement/src/Temp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Temp { diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/CopyResources.java b/test/functional/CacheManagement/src/tests/sharedclasses/CopyResources.java index d743f066853..47a389664b4 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/CopyResources.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/CopyResources.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/CreateConfig.java b/test/functional/CacheManagement/src/tests/sharedclasses/CreateConfig.java index 065d1bf47b1..6421f9b0567 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/CreateConfig.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/CreateConfig.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/RunCommand.java b/test/functional/CacheManagement/src/tests/sharedclasses/RunCommand.java index 1d701a274de..2ee56039417 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/RunCommand.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/RunCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/TestFailedException.java b/test/functional/CacheManagement/src/tests/sharedclasses/TestFailedException.java index 4b2fe952be2..8ae1a2fb614 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/TestFailedException.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/TestFailedException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/TestUtils.java b/test/functional/CacheManagement/src/tests/sharedclasses/TestUtils.java index b1d0806d601..324ecc1b609 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/TestUtils.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/TestUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying01.java index b29b26e2299..c774d119012 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying02.java index c0049355d49..aeffa4e5e24 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying03.java index aae0f0ef9c5..a39f223a8db 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying04.java index 50d9e10d003..03e691c7d79 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheCreationListingDestroying04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir01.java index 5a2ea685ccc..c3d9d2d9fdb 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir02.java index bedd2b9eff4..22f66ac673e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir03.java index b0d340c37ef..18dbe1154a9 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir04.java index 24c2fdaa0c1..c022f99a2f9 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir05.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir05.java index e883ce51f0c..e0c6705be2d 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir05.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir06.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir06.java index 6a90e7b302b..41eead7490e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir06.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir06.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir07.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir07.java index e096c0ab8e8..7ca500ddb04 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir07.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheDir07.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations01.java index 083f6fa587a..cca81393501 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations02.java index 76b92bb6561..802794b962e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations03.java index 1716f293d26..2819a7a0faf 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations04.java index ea0e84af40c..b183ecfa807 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations05.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations05.java index c28cbd6a815..6163e2e21cb 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations05.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations06.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations06.java index b867bfaa07f..669b1c96794 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations06.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations06.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations07.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations07.java index dba59523423..19424213f71 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations07.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations07.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations08.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations08.java index a14e38d8c5a..c45abbcab7b 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations08.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCacheGenerations08.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionModified.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionModified.java index 6155de6e045..050b7f97d46 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionModified.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionModified.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName01.java index 69f25f92c99..f51c521113d 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName02.java index 23ee4a1c10e..c0eba409d5b 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName03.java index ebffff06780..42159a3f6ce 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName04.java index 1fd259a59f1..5d83bd86d7e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionName04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent01.java index e8c03edae56..4b4f26d3a0e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent02.java index e13d8cc9df4..75adc07f7f0 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionSilent02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionXscmx01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionXscmx01.java index 52ecc31c8c9..ab775eb6f0b 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionXscmx01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCommandLineOptionXscmx01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestComplexSequence.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestComplexSequence.java index 5dde2461fd0..dde0ba7c6aa 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestComplexSequence.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestComplexSequence.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir01.java index b4b76931b89..6780a001829 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir02.java index 0748525d35c..a800fe3da10 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestControlDirCacheDir02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches01.java index bc45ea7bb80..3365f995e26 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches02.java index 35d93c30ab9..408ac540b5b 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches03.java index bf01f886ebc..dbf887868c8 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04.java index 424a79e1d84..9a6ce902f22 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04Helper.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04Helper.java index 0daaf1e11ce..454f788273d 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04Helper.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches04Helper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches05.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches05.java index ca8691bc068..e92f36f1f5e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches05.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCorruptedCaches05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreatingNonpersistentCache.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreatingNonpersistentCache.java index c7f8bc51b88..6687043162c 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreatingNonpersistentCache.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreatingNonpersistentCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreationAndCompatibility.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreationAndCompatibility.java index 2c9d26ed25d..1f191192679 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreationAndCompatibility.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestCreationAndCompatibility.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyAllWhenNoCaches.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyAllWhenNoCaches.java index bb486df2dd2..21c11a5f07a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyAllWhenNoCaches.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyAllWhenNoCaches.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyCache.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyCache.java index 348413ae0c8..a6ed6adbd1f 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyCache.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyNonExistentCaches.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyNonExistentCaches.java index 0158723b9b6..e88a6656383 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyNonExistentCaches.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDestroyNonExistentCaches.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDisableCorruptCacheDumps.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDisableCorruptCacheDumps.java index ad1560c3fb3..77ca315e06a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDisableCorruptCacheDumps.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestDisableCorruptCacheDumps.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireAllWhenNoCaches.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireAllWhenNoCaches.java index 043b66fba4d..8d98cec7a4c 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireAllWhenNoCaches.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireAllWhenNoCaches.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireDestroyOnCorruptCache.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireDestroyOnCorruptCache.java index e9a162b8023..d445e679446 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireDestroyOnCorruptCache.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpireDestroyOnCorruptCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpiringCaches.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpiringCaches.java index 547788363f9..304f41a69f5 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpiringCaches.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestExpiringCaches.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches01.java index fb2f3fe44b8..7244c61067d 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches02.java index ab699c93c36..d8bf9007d85 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches03.java index 4b26f14b578..68601b4b798 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches04.java index a5b3a06b07b..3fee185a398 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestIncompatibleCaches04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestListAllWhenNoCaches.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestListAllWhenNoCaches.java index 90a0426852a..bdfff8d1811 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestListAllWhenNoCaches.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestListAllWhenNoCaches.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles01.java index 116df9b7632..b02138aa3c3 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles02.java index 66b4a31370f..c8a5363c40a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestMovingControlFiles02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestOptionNone.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestOptionNone.java index 295f55f14a6..6c1f869b9dc 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestOptionNone.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestOptionNone.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving01.java index 9169df84377..2dc184cbc33 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving02.java index 139725a55c7..718b9cc459b 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving03.java index a09c75a0f73..8df0ea0c436 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPersistentCacheMoving03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats01.java index ddcd4ceebb9..20955c3641c 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats02.java index 76174ca8f0d..dfcb6a9273e 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats03.java index 79a477bc400..5a9a8a5246f 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats04.java index b35191e4d9f..a3c1d658b1a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats05.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats05.java index 6d5a7aad1c2..97b0d200476 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats05.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats06.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats06.java index 4b18bc79fd0..79b44d5ed93 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats06.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestPrintStats06.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache.java index 08120e17082..29be8cd06e8 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache02.java index 2b42df7edfc..9543734b7b6 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReattachingToNonpersistentCache02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset01.java index 504948bcc39..db6023139d4 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset02.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset02.java index e418f41ec35..00fd1428637 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset02.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset03.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset03.java index 1432598742e..8375ff1e496 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset03.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset04.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset04.java index 6f7affb2d70..15e0f1307f4 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset04.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset05.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset05.java index e986a35601d..464cb4d5a6f 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset05.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset06.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset06.java index 4cfede85404..fd00784efc4 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset06.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset06.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset07.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset07.java index 565170b332a..b4ce7046cbe 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset07.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestReset07.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSemaphoreMeddling01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSemaphoreMeddling01.java index 354399678fb..c81b0807fb6 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSemaphoreMeddling01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSemaphoreMeddling01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheEnableBCI.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheEnableBCI.java index c7845082328..0d3bc609558 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheEnableBCI.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheEnableBCI.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJavaAPI.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJavaAPI.java index b6fa599c3d0..030d1a2c068 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJavaAPI.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJavaAPI.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJvmtiAPI.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJvmtiAPI.java index c2e9fc8244d..fc128e82eef 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJvmtiAPI.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedCacheJvmtiAPI.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedMemoryMeddling01.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedMemoryMeddling01.java index d8c9fca3e83..f0d90493cf2 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedMemoryMeddling01.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestSharedMemoryMeddling01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseAOT.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseAOT.java index a5024133b2b..8013bd429b6 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseAOT.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseAOT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseData.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseData.java index 5516522454e..8333f077f91 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseData.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseHelper.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseHelper.java index 09ffa60f28e..ba0a1618d75 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseHelper.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseIO.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseIO.java index 5d799c8beaa..3b27f5beb2a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseIO.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestVerboseIO.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestZipCacheStoresAllBootstrapJar.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestZipCacheStoresAllBootstrapJar.java index d8646cd6bab..5488f98bb4a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/TestZipCacheStoresAllBootstrapJar.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/TestZipCacheStoresAllBootstrapJar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/AllTests.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/AllTests.java index 36accf24a94..b43b36f5964 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/AllTests.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/AllTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBase.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBase.java index 967b0dd1003..29299f69638 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBase.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBaseRealtime.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBaseRealtime.java index 5423d93ea05..8bdd90fd008 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBaseRealtime.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsBaseRealtime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDir.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDir.java index 8883995fb32..9ef7aa2f832 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDir.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDir.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDirRealtime.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDirRealtime.java index df2607fa1f9..57bdf5e4ee3 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDirRealtime.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsCacheDirRealtime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDir.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDir.java index 94c4525cae3..921969195b7 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDir.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDir.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDirRealtime.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDirRealtime.java index 2d007d14826..b540364ee1b 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDirRealtime.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsControlDirRealtime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/package tests.sharedclasses.options.junit; import tests.sharedclasses.TestUtils; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefault.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefault.java index ea242447716..82397f79ed7 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefault.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefault.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefaultRealtime.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefaultRealtime.java index a2c7bd3be36..25b90739d45 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefaultRealtime.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsDefaultRealtime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistent.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistent.java index 3bbd776f977..70946ffa515 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistent.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistentRealtime.java b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistentRealtime.java index 60aa14ee1cd..7a49167054a 100644 --- a/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistentRealtime.java +++ b/test/functional/CacheManagement/src/tests/sharedclasses/options/junit/TestOptionsNonpersistentRealtime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tests.sharedclasses.options.junit; diff --git a/test/functional/CacheManagement/testcode/InfiniteLoop.java b/test/functional/CacheManagement/testcode/InfiniteLoop.java index 11473a6c7d4..145fe2bdb2f 100644 --- a/test/functional/CacheManagement/testcode/InfiniteLoop.java +++ b/test/functional/CacheManagement/testcode/InfiniteLoop.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This class is used by TestDestroyCache.java to keep a shared class cache active */ diff --git a/test/functional/CacheManagement/testcode/ResetApp.java b/test/functional/CacheManagement/testcode/ResetApp.java index 2e1c2484d13..ef3506c90be 100644 --- a/test/functional/CacheManagement/testcode/ResetApp.java +++ b/test/functional/CacheManagement/testcode/ResetApp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class ResetApp { diff --git a/test/functional/CacheManagement/testcode/SimpleApp.java b/test/functional/CacheManagement/testcode/SimpleApp.java index 0d8366ff72b..ecb69c045a5 100644 --- a/test/functional/CacheManagement/testcode/SimpleApp.java +++ b/test/functional/CacheManagement/testcode/SimpleApp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SimpleApp { diff --git a/test/functional/CacheManagement/testcode/SimpleApp2.java b/test/functional/CacheManagement/testcode/SimpleApp2.java index e99f3819c8b..8de81a8ddca 100644 --- a/test/functional/CacheManagement/testcode/SimpleApp2.java +++ b/test/functional/CacheManagement/testcode/SimpleApp2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.regex.*; diff --git a/test/functional/CacheManagement/testcode/readme.txt b/test/functional/CacheManagement/testcode/readme.txt index fca31a1a102..e367b74639d 100644 --- a/test/functional/CacheManagement/testcode/readme.txt +++ b/test/functional/CacheManagement/testcode/readme.txt @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> Code in here is built into the top level testcode.jar file diff --git a/test/functional/DDR_Test/build.xml b/test/functional/DDR_Test/build.xml index 052ef5260f3..031d62d3dd9 100644 --- a/test/functional/DDR_Test/build.xml +++ b/test/functional/DDR_Test/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/DDR_Test/ddrSettings.mk b/test/functional/DDR_Test/ddrSettings.mk index 4a648b2d123..7d69fcea544 100644 --- a/test/functional/DDR_Test/ddrSettings.mk +++ b/test/functional/DDR_Test/ddrSettings.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## ifeq ("$(JDK_VERSION)","8") diff --git a/test/functional/DDR_Test/playlist.xml b/test/functional/DDR_Test/playlist.xml index 974b73183eb..0b3f06e0164 100644 --- a/test/functional/DDR_Test/playlist.xml +++ b/test/functional/DDR_Test/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ddrSettings.mk diff --git a/test/functional/DDR_Test/src/ddrext_excludes.xml b/test/functional/DDR_Test/src/ddrext_excludes.xml index 25429160d6d..9e46b612b0e 100644 --- a/test/functional/DDR_Test/src/ddrext_excludes.xml +++ b/test/functional/DDR_Test/src/ddrext_excludes.xml @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/CoreGen.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/CoreGen.java index 39cc75adeeb..3e6a1fa1c7e 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/CoreGen.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/CoreGen.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/DeadlockCoreGenerator.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/DeadlockCoreGenerator.java index 251ba706d7a..b67e62dbc6c 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/DeadlockCoreGenerator.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/DeadlockCoreGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/FindExtCoreGenerator.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/FindExtCoreGenerator.java index d6ecb64f95e..4f87588cacc 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/FindExtCoreGenerator.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/FindExtCoreGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/HelperExceptionForCoreGeneration.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/HelperExceptionForCoreGeneration.java index d213c9dafec..67f74dc280b 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/HelperExceptionForCoreGeneration.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/HelperExceptionForCoreGeneration.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/SCCTestHelper.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/SCCTestHelper.java index c77a8c4f964..925e2ea182c 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/SCCTestHelper.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/SCCTestHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/SimpleThread.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/SimpleThread.java index 49352ec8b0c..626c4e53fae 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/SimpleThread.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/SimpleThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/StackMapCoreGenerator.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/StackMapCoreGenerator.java index 89722e223db..2de91872217 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/StackMapCoreGenerator.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/StackMapCoreGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/corehelper/TestJITExtHelperThread.java b/test/functional/DDR_Test/src/j9vm/test/corehelper/TestJITExtHelperThread.java index 696c0fff7b1..76cfa5768e9 100644 --- a/test/functional/DDR_Test/src/j9vm/test/corehelper/TestJITExtHelperThread.java +++ b/test/functional/DDR_Test/src/j9vm/test/corehelper/TestJITExtHelperThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.corehelper; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/AutoRun.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/AutoRun.java index eacee6599ba..efbcf2bf8f4 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/AutoRun.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/AutoRun.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/Constants.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/Constants.java index ce019682a2e..9b2b72694f9 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/Constants.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/Constants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/DDRExtTesterBase.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/DDRExtTesterBase.java index 1dea93c149e..75d4c0bb801 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/DDRExtTesterBase.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/DDRExtTesterBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/SetupConfig.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/SetupConfig.java index 52ca27a7d1a..717257cbc06 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/SetupConfig.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/SetupConfig.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/DDRTestSuite.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/DDRTestSuite.java index 1d2b5c1c770..4483929923d 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/DDRTestSuite.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/DDRTestSuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCallsites.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCallsites.java index 7866f823bb5..6ea4e734a73 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCallsites.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCallsites.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestClassExt.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestClassExt.java index 6b16a7d50c8..41630c650be 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestClassExt.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestClassExt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCollisionResilientHashtable.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCollisionResilientHashtable.java index f68f9cfd321..ac101353136 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCollisionResilientHashtable.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestCollisionResilientHashtable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestDDRExtensionGeneral.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestDDRExtensionGeneral.java index aedc4f8ca50..9213826335d 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestDDRExtensionGeneral.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestDDRExtensionGeneral.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestFindExt.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestFindExt.java index 6729a6f180d..ea6fddfa72e 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestFindExt.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestFindExt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestJITExt.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestJITExt.java index be3cea6ed58..247b705afa8 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestJITExt.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestJITExt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestMonitors.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestMonitors.java index 3f410195e12..b44cf23d961 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestMonitors.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestMonitors.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestRTSpecificDDRExt.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestRTSpecificDDRExt.java index 70965101609..6482d57d5d8 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestRTSpecificDDRExt.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestRTSpecificDDRExt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestSharedClassesExt.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestSharedClassesExt.java index 2e1eab80992..bfc24640fda 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestSharedClassesExt.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestSharedClassesExt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestStackMap.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestStackMap.java index ec7affbd86e..3e7f530f86a 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestStackMap.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestStackMap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTenants.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTenants.java index 566e4326c78..5c25a93c044 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTenants.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTenants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestThread.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestThread.java index c98adc02728..2d40d122923 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestThread.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTypeResolution.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTypeResolution.java index 44d9cb827ea..055bc2b693b 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTypeResolution.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/TestTypeResolution.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase1.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase1.java index 04922567a0a..e9ae24688be 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase1.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit.deadlock; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase2.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase2.java index 9179c8b65f7..a9989ca4dfb 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase2.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit.deadlock; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase3.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase3.java index 0e1f06b0ebd..9a9a406f861 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase3.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit.deadlock; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase4.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase4.java index f8eb2aa5047..199b7e88b26 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase4.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit.deadlock; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase5.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase5.java index 2c15d144d2a..0dae9b994fd 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase5.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit.deadlock; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase6.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase6.java index e0c7ba03bf7..716da0734d8 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase6.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/junit/deadlock/TestDeadlockCase6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.junit.deadlock; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRJunitRunnerPlugin.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRJunitRunnerPlugin.java index 9c704f0a3e3..9f0fb5a6cac 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRJunitRunnerPlugin.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRJunitRunnerPlugin.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.plugin; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRPluginsTestCmd.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRPluginsTestCmd.java index 296435cddec..567dfb8fece 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRPluginsTestCmd.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/DDRPluginsTestCmd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.plugin; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/dumpsegments/DumpSegmentsVM29.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/dumpsegments/DumpSegmentsVM29.java index 2d3c03d2760..a7fe93b5023 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/dumpsegments/DumpSegmentsVM29.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/plugin/dumpsegments/DumpSegmentsVM29.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.plugin.dumpsegments; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpGenerator.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpGenerator.java index f4fc851d9d8..18df9ce41d8 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpGenerator.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpUtil.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpUtil.java index 109d50daf9b..500022ff8a0 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpUtil.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/CoreDumpUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/DDROutputStream.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/DDROutputStream.java index 39a7ca876ee..559d61ddfba 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/DDROutputStream.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/DDROutputStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/GenerateCore.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/GenerateCore.java index 7f1c5ccdaa6..39377b577b6 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/GenerateCore.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/GenerateCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ClassForNameOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ClassForNameOutputParser.java index 297fdd0bcd7..498700b4629 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ClassForNameOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ClassForNameOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/DumpRomClassOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/DumpRomClassOutputParser.java index 9b3263e4518..42aa915ad5e 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/DumpRomClassOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/DumpRomClassOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/FindVMOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/FindVMOutputParser.java index 88bd46ec999..c2d0388a965 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/FindVMOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/FindVMOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9ClassOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9ClassOutputParser.java index 79e99ee86f7..63b87ac8c15 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9ClassOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9ClassOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9JavaVmOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9JavaVmOutputParser.java index 136827e6bea..1b5eea09aa1 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9JavaVmOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9JavaVmOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9MethodOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9MethodOutputParser.java index a396eb9525e..ad03228a4b4 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9MethodOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9MethodOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolOutputParser.java index 8dbfea7ae94..bb774962e38 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolPuddleListOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolPuddleListOutputParser.java index ea3280752fd..89261e0b007 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolPuddleListOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9PoolPuddleListOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9RomClassOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9RomClassOutputParser.java index 307e478d1df..121c72c3add 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9RomClassOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/J9RomClassOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/MethodForNameOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/MethodForNameOutputParser.java index e8bb3716772..5b2c4340652 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/MethodForNameOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/MethodForNameOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ParserUtil.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ParserUtil.java index 177e8592839..30f174b669d 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ParserUtil.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ParserUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/RomclassForNameOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/RomclassForNameOutputParser.java index 3a315861e01..6baa59a74c8 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/RomclassForNameOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/RomclassForNameOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ShrcStatsOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ShrcStatsOutputParser.java index b2f4c700253..2e5ba2e3832 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ShrcStatsOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ShrcStatsOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/StackSlotsOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/StackSlotsOutputParser.java index aededbc54ac..896117da633 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/StackSlotsOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/StackSlotsOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ThreadsOutputParser.java b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ThreadsOutputParser.java index e3ccfb04900..2a3bc8d70cc 100644 --- a/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ThreadsOutputParser.java +++ b/test/functional/DDR_Test/src/j9vm/test/ddrext/util/parser/ThreadsOutputParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ddrext.util.parser; diff --git a/test/functional/DDR_Test/tck_ddrext.xml b/test/functional/DDR_Test/tck_ddrext.xml index f3aaa2f6011..91e37d6be35 100644 --- a/test/functional/DDR_Test/tck_ddrext.xml +++ b/test/functional/DDR_Test/tck_ddrext.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/HealthCenter/build.xml b/test/functional/HealthCenter/build.xml index 36bc27e4d40..379f387449e 100644 --- a/test/functional/HealthCenter/build.xml +++ b/test/functional/HealthCenter/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/HealthCenter/healthcenter.xml b/test/functional/HealthCenter/healthcenter.xml index 1eb010a059c..6af24ae22c8 100644 --- a/test/functional/HealthCenter/healthcenter.xml +++ b/test/functional/HealthCenter/healthcenter.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/HealthCenter/playlist.xml b/test/functional/HealthCenter/playlist.xml index 75caf270192..b368284f4fb 100644 --- a/test/functional/HealthCenter/playlist.xml +++ b/test/functional/HealthCenter/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/IllegalAccessError_for_protected_method/.gitignore b/test/functional/IllegalAccessError_for_protected_method/.gitignore index ad3126a00a0..609ed1773dd 100644 --- a/test/functional/IllegalAccessError_for_protected_method/.gitignore +++ b/test/functional/IllegalAccessError_for_protected_method/.gitignore @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /bin/ diff --git a/test/functional/IllegalAccessError_for_protected_method/build.xml b/test/functional/IllegalAccessError_for_protected_method/build.xml index 51df583ea47..ad8b76b3cb3 100644 --- a/test/functional/IllegalAccessError_for_protected_method/build.xml +++ b/test/functional/IllegalAccessError_for_protected_method/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/IllegalAccessError_for_protected_method/playlist.xml b/test/functional/IllegalAccessError_for_protected_method/playlist.xml index 691e1ed83e2..15a37267233 100644 --- a/test/functional/IllegalAccessError_for_protected_method/playlist.xml +++ b/test/functional/IllegalAccessError_for_protected_method/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Agent.java b/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Agent.java index 5e036fec164..9ecfda7a1ff 100644 --- a/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Agent.java +++ b/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Agent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test; diff --git a/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Testcase.java b/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Testcase.java index 6e904d5c3f7..a240e1332ee 100644 --- a/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Testcase.java +++ b/test/functional/IllegalAccessError_for_protected_method/src/org/openj9/test/Testcase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test; diff --git a/test/functional/IllegalAccessError_for_protected_method/testng.xml b/test/functional/IllegalAccessError_for_protected_method/testng.xml index 02694784bf9..4ae6c4f743e 100644 --- a/test/functional/IllegalAccessError_for_protected_method/testng.xml +++ b/test/functional/IllegalAccessError_for_protected_method/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/InstrumentationAgent/build.xml b/test/functional/InstrumentationAgent/build.xml index 4006883469c..cc4c3b131ad 100644 --- a/test/functional/InstrumentationAgent/build.xml +++ b/test/functional/InstrumentationAgent/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/InstrumentationAgent/src/org/openj9/test/util/JavaAgent.java b/test/functional/InstrumentationAgent/src/org/openj9/test/util/JavaAgent.java index 254b4239380..4ff3f12fbf9 100644 --- a/test/functional/InstrumentationAgent/src/org/openj9/test/util/JavaAgent.java +++ b/test/functional/InstrumentationAgent/src/org/openj9/test/util/JavaAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/DateUtil.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/DateUtil.java index 50ddd7020c1..967679d09f9 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/DateUtil.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/DateUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/Exclude.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/Exclude.java index 1630b93c194..4c4adaddd42 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/Exclude.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/Exclude.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/ExcludeList.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/ExcludeList.java index ce6f416cfe9..feb3535d21a 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/ExcludeList.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/ExcludeList.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/IXMLDocumentHandler.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/IXMLDocumentHandler.java index 364e997fddf..a8a9f87b0e7 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/IXMLDocumentHandler.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/IXMLDocumentHandler.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLException.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLException.java index a240b716a4d..0b5f9f19fde 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLException.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLInterface.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLInterface.java index aa93468a529..c5a87315fc1 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLInterface.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLParser.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLParser.java index 0edd5143a5f..adca8ac5d79 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLParser.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLSpec.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLSpec.java index 517e44dc571..5ce0d6351bf 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLSpec.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLSpec.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLStringBuffer.java b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLStringBuffer.java index 4acd4f40707..b08e7cd9632 100644 --- a/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLStringBuffer.java +++ b/test/functional/J9 Exclude File Support/src/com/oti/j9/exclude/XMLStringBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.oti.j9.exclude; diff --git a/test/functional/JIT_Test/build.xml b/test/functional/JIT_Test/build.xml index 468b31001c1..5b563ab8976 100644 --- a/test/functional/JIT_Test/build.xml +++ b/test/functional/JIT_Test/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JIT_Test/excludedClasses/sun/tools/util/LoadEnvironment.java b/test/functional/JIT_Test/excludedClasses/sun/tools/util/LoadEnvironment.java index 7f02e2cf11b..fbec4189ad0 100644 --- a/test/functional/JIT_Test/excludedClasses/sun/tools/util/LoadEnvironment.java +++ b/test/functional/JIT_Test/excludedClasses/sun/tools/util/LoadEnvironment.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package sun.tools.util; diff --git a/test/functional/JIT_Test/playlist.xml b/test/functional/JIT_Test/playlist.xml index e6a52083c0d..79f402ab8ee 100644 --- a/test/functional/JIT_Test/playlist.xml +++ b/test/functional/JIT_Test/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JIT_Test/src/jit/test/finalizer/TestObject.java b/test/functional/JIT_Test/src/jit/test/finalizer/TestObject.java index 12638650b24..926ea149b59 100644 --- a/test/functional/JIT_Test/src/jit/test/finalizer/TestObject.java +++ b/test/functional/JIT_Test/src/jit/test/finalizer/TestObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.finalizer; diff --git a/test/functional/JIT_Test/src/jit/test/hw/hw.java b/test/functional/JIT_Test/src/jit/test/hw/hw.java index 74db76781d1..fc53250a1a8 100644 --- a/test/functional/JIT_Test/src/jit/test/hw/hw.java +++ b/test/functional/JIT_Test/src/jit/test/hw/hw.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * This is meant to test the gc policies(gencon and optavgpause), diff --git a/test/functional/JIT_Test/src/jit/test/jar/JarTestClassLoader.java b/test/functional/JIT_Test/src/jit/test/jar/JarTestClassLoader.java index ac0ae679936..0a70a52a469 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/JarTestClassLoader.java +++ b/test/functional/JIT_Test/src/jit/test/jar/JarTestClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jar; diff --git a/test/functional/JIT_Test/src/jit/test/jar/JarTester.bat b/test/functional/JIT_Test/src/jit/test/jar/JarTester.bat index 7c159a73df2..e02d734f594 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/JarTester.bat +++ b/test/functional/JIT_Test/src/jit/test/jar/JarTester.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set CLASSPATH=. diff --git a/test/functional/JIT_Test/src/jit/test/jar/JarTester.java b/test/functional/JIT_Test/src/jit/test/jar/JarTester.java index 17b6611b269..b5ff56bb4b2 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/JarTester.java +++ b/test/functional/JIT_Test/src/jit/test/jar/JarTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jar; diff --git a/test/functional/JIT_Test/src/jit/test/jar/JarTester2.bat b/test/functional/JIT_Test/src/jit/test/jar/JarTester2.bat index fb827d36912..6d63af344ab 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/JarTester2.bat +++ b/test/functional/JIT_Test/src/jit/test/jar/JarTester2.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set JRE_BIN=%1 diff --git a/test/functional/JIT_Test/src/jit/test/jar/JarTesterMT.java b/test/functional/JIT_Test/src/jit/test/jar/JarTesterMT.java index 93b5fbfc820..a77aaf031a1 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/JarTesterMT.java +++ b/test/functional/JIT_Test/src/jit/test/jar/JarTesterMT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jar; diff --git a/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoader.java b/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoader.java index f58e988865e..792e68e6373 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoader.java +++ b/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jar; diff --git a/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoaderMT.java b/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoaderMT.java index 87cfc7dc342..1d7edfd499e 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoaderMT.java +++ b/test/functional/JIT_Test/src/jit/test/jar/ZipTestClassLoaderMT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jar; diff --git a/test/functional/JIT_Test/src/jit/test/jar/ZipTester.bat b/test/functional/JIT_Test/src/jit/test/jar/ZipTester.bat index 0230b315036..e0c24e50eed 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/ZipTester.bat +++ b/test/functional/JIT_Test/src/jit/test/jar/ZipTester.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set CLASSPATH=. diff --git a/test/functional/JIT_Test/src/jit/test/jar/ZipTester.java b/test/functional/JIT_Test/src/jit/test/jar/ZipTester.java index 50c1ec7f541..4e7ead5cf17 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/ZipTester.java +++ b/test/functional/JIT_Test/src/jit/test/jar/ZipTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jar; diff --git a/test/functional/JIT_Test/src/jit/test/jar/ZipTester2.bat b/test/functional/JIT_Test/src/jit/test/jar/ZipTester2.bat index 11264cb9368..7becb62ac50 100644 --- a/test/functional/JIT_Test/src/jit/test/jar/ZipTester2.bat +++ b/test/functional/JIT_Test/src/jit/test/jar/ZipTester2.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set JRE_BIN=%1 diff --git a/test/functional/JIT_Test/src/jit/test/jitserver/JITServerTest.java b/test/functional/JIT_Test/src/jit/test/jitserver/JITServerTest.java index 6d1f3b72bfe..fa8aa42ccce 100644 --- a/test/functional/JIT_Test/src/jit/test/jitserver/JITServerTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitserver/JITServerTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitserver; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/Test.java b/test/functional/JIT_Test/src/jit/test/jitt/Test.java index 60067fcf26f..a9d7dafcee0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/Test.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/array/byteArrayLoadStore.java b/test/functional/JIT_Test/src/jit/test/jitt/array/byteArrayLoadStore.java index 5360f951295..4b66e5648bb 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/array/byteArrayLoadStore.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/array/byteArrayLoadStore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.array; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/array/charArrayLoadStore.java b/test/functional/JIT_Test/src/jit/test/jitt/array/charArrayLoadStore.java index 50a51357c1d..d34a034d363 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/array/charArrayLoadStore.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/array/charArrayLoadStore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.array; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStore.java b/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStore.java index 7d10bd729f0..7f4e428e810 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStore.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.array; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStoreConstIndices.java b/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStoreConstIndices.java index fc609af9834..67241d9648d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStoreConstIndices.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/array/intArrayLoadStoreConstIndices.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.array; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/array/multianewarray.java b/test/functional/JIT_Test/src/jit/test/jitt/array/multianewarray.java index bcdd0f4af65..05a78c5c1dd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/array/multianewarray.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/array/multianewarray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.array; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/array/shortArrayLoadStore.java b/test/functional/JIT_Test/src/jit/test/jitt/array/shortArrayLoadStore.java index 6f793619629..5a5993ea0c7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/array/shortArrayLoadStore.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/array/shortArrayLoadStore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.array; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaArithmetic.java b/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaArithmetic.java index 4ed6fe2ccd7..e3a273b7f0f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaArithmetic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaArithmetic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.assembler; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaShifts.java b/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaShifts.java index 3b97bb60fc1..a05aa00b6c5 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaShifts.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/assembler/LongJavaShifts.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.assembler; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest.java b/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest.java index 8fb8b39a5ee..47069adbd50 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: SwitchTest.java // Testing the switch statement with different value types. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest2.java index 99c1f33d4eb..0f5f1e66dc9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/assembler/SwitchTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: SwitchTest2.java // Testing the switch statement with different value types. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/Cast001.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/Cast001.java index b5fbff7b800..4afe2cfb3ed 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/Cast001.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/Cast001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/CheckCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/CheckCast.java index 2c01fbe87cb..8439df2b686 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/CheckCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/CheckCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/I2BCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/I2BCast.java index 566e089888a..38a7cece979 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/I2BCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/I2BCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/I2CCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/I2CCast.java index 9dca76816a0..7ab1b4fc72a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/I2CCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/I2CCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/I2SCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/I2SCast.java index de65e442414..535ce64942a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/I2SCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/I2SCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/InstOf001.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/InstOf001.java index f0b8f4adc42..a8e74133d3c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/InstOf001.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/InstOf001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/InstanceOf.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/InstanceOf.java index a8f33aac4b0..66d36caa9a8 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/InstanceOf.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/InstanceOf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2BCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2BCast.java index d881f88392f..a1a970b9646 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2BCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2BCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2CCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2CCast.java index c5429a0d5ef..2d8f70d9982 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2CCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2CCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2ICast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2ICast.java index b4b16f5813e..8c586f853d2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2ICast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2ICast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2SCast.java b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2SCast.java index c4a7ea7230e..85eca25ceef 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/casting/L2SCast.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/casting/L2SCast.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.casting; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/cfg/nestedExceptions.java b/test/functional/JIT_Test/src/jit/test/jitt/cfg/nestedExceptions.java index d765fbf0d37..aa0e1af3e43 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/cfg/nestedExceptions.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/cfg/nestedExceptions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.cfg; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/AOTTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/AOTTest.java index f41caf17702..1555bf7bbc9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/AOTTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/AOTTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/BasicTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/BasicTest.java index c4822d39ce6..3191e819dd1 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/BasicTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/BasicTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/BoundaryTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/BoundaryTest.java index 038b2fc2cdd..f28f68aa820 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/BoundaryTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/BoundaryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AT.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AT.java index c946cdf5c49..6f56a34c9cb 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AT.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AotTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AotTest.java index aa229383b8c..046ba6ddd39 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AotTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_AotTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_BT.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_BT.java index 451d6abdf44..e0f8d90e751 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_BT.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller1_BT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AT.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AT.java index 1f806068662..7be53a4056c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AT.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AotTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AotTest.java index 730477a8e37..4522dc8ddd6 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AotTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_AotTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_BT.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_BT.java index b06a77e10f0..e924645219c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_BT.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Caller2_BT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/CodeCacheObj.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/CodeCacheObj.java index 0862e19a226..5034f359de0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/CodeCacheObj.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/CodeCacheObj.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Constants.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Constants.java index 63012ca9e8e..1eef438ee37 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/Constants.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/Constants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdder.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdder.java index d69b70a3546..631db435003 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdder.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderCaller.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderCaller.java index 56ffa1aba5c..de1115daecb 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderCaller.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderCaller.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_Int.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_Int.java index 2659c529865..55fffdc3891 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_Int.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_Int.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_String.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_String.java index 84f8d1934fb..f3fc59eb765 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_String.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/IAdderImpl_String.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/LogParserThread.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/LogParserThread.java index 9ae9df8eb7d..a7a060534ed 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/LogParserThread.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/LogParserThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/MethodObj.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/MethodObj.java index 593d83f480c..d37862aa7c6 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/MethodObj.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/MethodObj.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/SpaceReuseTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/SpaceReuseTest.java index 342f3cdd082..b98dec2368b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/SpaceReuseTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/SpaceReuseTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AT.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AT.java index 559fa561067..3d4c5af9ca5 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AT.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AotTest.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AotTest.java index 9994f44a62a..d0c8bf85d3c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AotTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_AotTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_BT.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_BT.java index 176794c34d0..3fad87b65be 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_BT.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TargetClass_BT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TestManager.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TestManager.java index 347cb04c7ce..26d7c6f44d1 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TestManager.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TestManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Advanced.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Advanced.java index f52e3bdb705..48005d648e2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Advanced.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Advanced.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Basic.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Basic.java index c27a9c226f9..e50c828bb49 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Basic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_Basic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_IPIC.java b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_IPIC.java index 88387c4aab6..435a2480661 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_IPIC.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/codecache/TrampolineTest_IPIC.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.codecache; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/BoundsCheck.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/BoundsCheck.java index 02dacbba5a0..ac15d82daa6 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/BoundsCheck.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/BoundsCheck.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/CharacterConverterInt3.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/CharacterConverterInt3.java index fdd04fdfb0e..2c69d191879 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/CharacterConverterInt3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/CharacterConverterInt3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/DivideByZero.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/DivideByZero.java index feedb08182a..3913b08736b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/DivideByZero.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/DivideByZero.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/HangOnFloatPrint.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/HangOnFloatPrint.java index 0892296bf6d..65f9ad32623 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/HangOnFloatPrint.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/HangOnFloatPrint.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/InvalidArrayStoreNotCaught.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/InvalidArrayStoreNotCaught.java index bb2c33810e2..c6ba6c72263 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/InvalidArrayStoreNotCaught.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/InvalidArrayStoreNotCaught.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongDivideByZero.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongDivideByZero.java index aeee0f79ca7..fc302253330 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongDivideByZero.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongDivideByZero.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongRemainderByZero.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongRemainderByZero.java index 1883232c105..d62946d4217 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongRemainderByZero.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/LongRemainderByZero.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/crashes/RemainderByZero.java b/test/functional/JIT_Test/src/jit/test/jitt/crashes/RemainderByZero.java index 08e27a3b72e..eb5ab8841e1 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/crashes/RemainderByZero.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/crashes/RemainderByZero.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.crashes; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/ClassInSamePackage.java b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/ClassInSamePackage.java index d4525a3dbf4..8902f1222b2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/ClassInSamePackage.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/ClassInSamePackage.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.ctresolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/SpecialMethodSameClass.java b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/SpecialMethodSameClass.java index 3489030ba35..767ea362acf 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/SpecialMethodSameClass.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/SpecialMethodSameClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.ctresolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticFieldSameClass.java b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticFieldSameClass.java index de0d2a06d08..6a71b5160a6 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticFieldSameClass.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticFieldSameClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.ctresolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticMethodSameClass.java b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticMethodSameClass.java index b7e26dd7281..d240975d3de 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticMethodSameClass.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/ctresolves/StaticMethodSameClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.ctresolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionLocal.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionLocal.java index e88ac0a0d00..02e6311746d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionLocal.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionLocal.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionScoped.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionScoped.java index 49e423fccf3..32154b9c77a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionScoped.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/ExceptionScoped.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/InterpJitException.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/InterpJitException.java index 7ab4cd1e7b6..627c6c2f161 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/InterpJitException.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/InterpJitException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/JitInterpException.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/JitInterpException.java index 84fec188767..d9ac8383a4e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/JitInterpException.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/JitInterpException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseBoundsCheck.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseBoundsCheck.java index 1dd256e4d8b..c80b7d9af2e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseBoundsCheck.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseBoundsCheck.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseNullCheck.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseNullCheck.java index b7aad91d4dc..b79a0c613bd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseNullCheck.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/RaiseNullCheck.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE0.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE0.java index c53525700e8..d9758fa5fbf 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE0.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE0.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE1_ExceptionCatchOnly.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE1_ExceptionCatchOnly.java index 23f73ac2808..8ad3a82f57b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE1_ExceptionCatchOnly.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE1_ExceptionCatchOnly.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE2_SimpleTryCatchFinally.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE2_SimpleTryCatchFinally.java index 61bf738428b..464b5679dda 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE2_SimpleTryCatchFinally.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE2_SimpleTryCatchFinally.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE3_TryCatchFinallyNested1.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE3_TryCatchFinallyNested1.java index e9995ff7ff1..95f56e81a15 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE3_TryCatchFinallyNested1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE3_TryCatchFinallyNested1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE4_TryCatchFinallyNested2.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE4_TryCatchFinallyNested2.java index 7840cd6a158..324514cc009 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE4_TryCatchFinallyNested2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE4_TryCatchFinallyNested2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE5_TryCatchFinallyNested3.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE5_TryCatchFinallyNested3.java index 5018b36b3b0..ee6384837fd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE5_TryCatchFinallyNested3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE5_TryCatchFinallyNested3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE6_TryCatchFinallyNested4.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE6_TryCatchFinallyNested4.java index dcab7602cf9..d46469a3b24 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE6_TryCatchFinallyNested4.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/SanityE6_TryCatchFinallyNested4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/readLineBug.java b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/readLineBug.java index b39704e571e..d4c14e9b463 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/exceptions/readLineBug.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/exceptions/readLineBug.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.exceptions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/fields/GetArrayField.java b/test/functional/JIT_Test/src/jit/test/jitt/fields/GetArrayField.java index 3d7d7b59e68..5bebaf7be79 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/fields/GetArrayField.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/fields/GetArrayField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.fields; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/fields/GetField.java b/test/functional/JIT_Test/src/jit/test/jitt/fields/GetField.java index 53f161e386c..139ed92f92b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/fields/GetField.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/fields/GetField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.fields; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/fields/GetStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/fields/GetStatic.java index 28012c4da27..31c95eb0fc8 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/fields/GetStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/fields/GetStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.fields; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/fields/PutStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/fields/PutStatic.java index 01d7e0b0ff4..bec156b9377 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/fields/PutStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/fields/PutStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.fields; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleAdditionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleAdditionTest1.java index 79abfee6008..c27d9cb3d27 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleAdditionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleAdditionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest1.java index e1d7a6859b4..f35f38e9845 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest2.java index 2c51fa8fd02..06410714cc0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayLoadTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest1.java index c801f7e24d9..c7e951f2670 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest2.java index 1e61c51ef66..624e5374ab0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleArrayStoreTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleDivisionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleDivisionTest1.java index a51358147d7..2e0cbf1d4d3 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleDivisionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleDivisionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleSubtractionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleSubtractionTest1.java index 633e3c15b6d..bd4d2298e9c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleSubtractionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleSubtractionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToFloat.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToFloat.java index 308f11c63ba..6e165b7dd25 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToFloat.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToFloat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: DoubleToFloat.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToIntegerTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToIntegerTest1.java index 3d173b0c15c..532ff357889 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToIntegerTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToIntegerTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToLongTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToLongTest1.java index eee1ffcc415..123d29a7594 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToLongTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToLongTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthers.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthers.java index c9949362171..cac5afa855d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthers.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthersTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthersTest2.java index dd47cb4c0ea..f8d0cdf52a4 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthersTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/DoubleToOthersTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatAdditionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatAdditionTest1.java index b1ecc5f86c5..8a8372c7d59 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatAdditionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatAdditionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest1.java index 3aa9d1bdaed..5af5182901f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest2.java index 992c6827cef..6964b4c6b0c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayLoadTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest1.java index 2cd1caa74a4..73243c757d0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest2.java index 824cf2a6464..c16779c65a2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatArrayStoreTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatDivisionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatDivisionTest1.java index 2b45ca5ef3f..f34b99dcf0b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatDivisionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatDivisionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatMultiplicationTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatMultiplicationTest1.java index b91fd7ec040..8ce5e8e9254 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatMultiplicationTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatMultiplicationTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTest.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTest.java index 2c9531b8abd..f7ac1c53f41 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: FloatStaticTest.java // Testing the assignment of static floats and static volatile floats diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelper.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelper.java index 6427f0bf9c2..93dc0dffe60 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelper.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelperVolatile.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelperVolatile.java index 7cc68673a29..f7865c93d21 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelperVolatile.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatStaticTestHelperVolatile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatSubtractionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatSubtractionTest1.java index 184d54b098e..3b2a69eb649 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatSubtractionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatSubtractionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleNotStrict.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleNotStrict.java index 190f5e52067..f5e6ccaf051 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleNotStrict.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleNotStrict.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: FloatToDoubleNotStrict.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleStrict.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleStrict.java index e33cea1309d..fef3bc749ff 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleStrict.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToDoubleStrict.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: FloatToDouble.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToInteger.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToInteger.java index f2b08762991..7f95c0967bd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToInteger.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToInteger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: FloatToInteger.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToIntegerTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToIntegerTest1.java index 96def4db9b5..837a1a70a87 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToIntegerTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToIntegerTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToLongTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToLongTest1.java index 7f3518ca751..81deb440635 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToLongTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToLongTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthers.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthers.java index a23b1388f76..0f06e1cca06 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthers.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthersTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthersTest2.java index ca98c0e39cf..38c2e28f3ea 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthersTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/FloatToOthersTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDouble.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDouble.java index 810fc51ecbf..a09c6962a35 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDouble.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDouble.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDoubleTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDoubleTest2.java index da337c342c6..04790d104c2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDoubleTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToDoubleTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloat.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloat.java index b04089c49d8..45e2e03aeef 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloat.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloatTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloatTest2.java index d411ad2b17e..138fd73797a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloatTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/OthersToFloatTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/floats/StaticFloatAndDoubleTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/floats/StaticFloatAndDoubleTest1.java index 35195bdd589..2c81ffff1b5 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/floats/StaticFloatAndDoubleTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/floats/StaticFloatAndDoubleTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.floats; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/gc/GCTestClass.java b/test/functional/JIT_Test/src/jit/test/jitt/gc/GCTestClass.java index 8ac29854b44..d1457f8f97f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/gc/GCTestClass.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/gc/GCTestClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.gc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedArray.java b/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedArray.java index f90b96c97a4..57711cc9ce9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedArray.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.gc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedField.java b/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedField.java index 39f7a699226..3b8f2b4a362 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedField.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.gc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedStatic.java index bd9f5620089..50c424d99cf 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/gc/RemberedStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.gc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/gc/Scavenge.java b/test/functional/JIT_Test/src/jit/test/jitt/gc/Scavenge.java index 3836c344898..951f0db3e66 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/gc/Scavenge.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/gc/Scavenge.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.gc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/geCasting/clearHighOrderBits.java b/test/functional/JIT_Test/src/jit/test/jitt/geCasting/clearHighOrderBits.java index 0a7ac881a19..11eb6a1b6fd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/geCasting/clearHighOrderBits.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/geCasting/clearHighOrderBits.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: clearHighOrderBits.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/geCasting/signExtendedHighOrderBits.java b/test/functional/JIT_Test/src/jit/test/jitt/geCasting/signExtendedHighOrderBits.java index da91d6f69e8..eaffa0c0ebe 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/geCasting/signExtendedHighOrderBits.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/geCasting/signExtendedHighOrderBits.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: signExtendedHighOrderBits.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/addImmed.java b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/addImmed.java index 07965c2737d..56d154f7834 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/addImmed.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/addImmed.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: addImmed.java // Test new add immediate Golden Eagle instructions diff --git a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/andImmed.java b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/andImmed.java index c05521bae26..0c2d5e9a1ff 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/andImmed.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/andImmed.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: AndImmed.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/cmpImmed.java b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/cmpImmed.java index b605eac5175..3cfc5b6ca9b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/cmpImmed.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/cmpImmed.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: cmpImmed.java // Test new compare immediate Golden Eagle instructions diff --git a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/orImmed.java b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/orImmed.java index e774613624d..73f0897b7c0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/orImmed.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/orImmed.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: orImmed.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/xorImmed.java b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/xorImmed.java index 9ef438e96bb..51754aace5f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/immedOp/xorImmed.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/immedOp/xorImmed.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: xorImmed.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface1.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface1.java index 49940fc9e30..4e59939bc44 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface2.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface2.java index 5e862bf2320..1ee5329a4f4 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface3.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface3.java index 0bf0dd61ff4..6f4a13f7ff2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface4.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface4.java index 212247faf59..961b153048e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface4.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface5.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface5.java index ff76cd0ecc7..8f1bcf7eec8 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface5.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface6.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface6.java index 52d9d9ccc01..cd6e01f4326 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface6.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7.java index 61eefafd8d8..b0a30ccaf91 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7A.java index 6744231515d..3ce19b4495d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7B.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7B.java index 4d5353f4751..54cca84af83 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7B.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7C.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7C.java index a756ff52adc..7cc1d718816 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7C.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/Interface7C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest1.java index ce67d28d007..4e8f8bceee4 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing the simplest interface test, with only one implementation of an interface diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2.java index 82cf141809d..1c954c5ec0f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest2. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2A.java index fb057acd776..affe31ac549 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest2. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2B.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2B.java index 89a9622c1cb..2d1f0800790 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2B.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest2. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2C.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2C.java index a39541d3b7f..4f0880c23b7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2C.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest2C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest2. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3.java index 7b559d15b8b..585fe78dfe2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest3. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3A.java index cc6b54b119d..f4f64c4848c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest3. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3B.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3B.java index f11542e4e9d..876bc05aff9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3B.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest3. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3C.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3C.java index 0bdfb08c36f..21dce2d1dc7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3C.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest3. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3D.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3D.java index 533fbffd610..45fd4a34bbd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3D.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest3D.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing multiple implementations of InterfaceTest3. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4.java index 6571998a959..a8f5df51eda 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing implemented interface methods and non-interface methods. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4A.java index 670e0746eab..71ec6aaf41e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing interface implementation and non-interface implementation methods. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4B.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4B.java index 2a4eb01e59f..220379ef139 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4B.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest4B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing interface implementation and non-interface implementation methods. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5.java index c66a0a337cd..222b67d3050 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing partial implementations of an interface, thus requiring an abstract class and // inheritance of the abstract class to fully implement an interface diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A.java index 2efa1aa3fbc..9e7c50bb7e7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing partial implementations of an interface, thus requiring an abstract class and // inheritance of the abstract class to fully implement an interface diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A_Child.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A_Child.java index e9f47e0c879..f8f711cd3b8 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A_Child.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5A_Child.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing partial implementations of an interface, thus requiring an abstract class and // inheritance of the abstract class to fully implement an interface diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B.java index 927dcd24cd6..7c2cf102234 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing partial implementations of an interface, thus requiring an abstract class and // inheritance of the abstract class to fully implement an interface diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B_Child.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B_Child.java index 26060770a04..67b55fcc378 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B_Child.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest5B_Child.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing partial implementations of an interface, thus requiring an abstract class and // inheritance of the abstract class to fully implement an interface diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6.java index 1961d487873..ece9ce09254 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing variables in Interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6A.java index 8b2e95914b0..5b74bfde069 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest6A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing variables in Interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7.java index f4067c293fe..ca8b142c1e6 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7A.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7A.java index edffb7e2db5..27e12133d0e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7A.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7B.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7B.java index dddc7333277..0fdc9f4022c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7B.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7C.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7C.java index 85384dc6482..a389af58687 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7C.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7_First.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7_First.java index 23dd80e9a90..0823b485214 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7_First.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InterfaceTest7_First.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Testing extended interfaces diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeInterface.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeInterface.java index a7f335a908e..cc30fa6db4b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeInterface.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeStatic.java index c474a50cb2a..cfa08e36518 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeVirtual.java b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeVirtual.java index d713904748c..6951195df36 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeVirtual.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/invoke/InvokeVirtual.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.invoke; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div01.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div01.java index a62762459d7..2b834ad516f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div01.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div02.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div02.java index 3e2e6150606..f00407caf4d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div02.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div03.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div03.java index 38c199a1842..1fc45cb5fb3 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div03.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div04.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div04.java index 7673360de6f..34e00e41a63 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div04.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div05.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div05.java index 66006751096..0977b0d124a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div05.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div06.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div06.java index 4fc7831e0c9..a5940760a54 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div06.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div06.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div07.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div07.java index 61c24e99520..b28a39647ef 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div07.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div07.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/Div08.java b/test/functional/JIT_Test/src/jit/test/jitt/math/Div08.java index 77896053050..c9091f93891 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/Div08.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/Div08.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerAdd.java b/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerAdd.java index 798b554a957..14fc47ca05a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerAdd.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerAdd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerMultiply.java b/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerMultiply.java index f1dc7a288a6..ff8340e59f9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerMultiply.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/IntegerMultiply.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/LongMultiply.java b/test/functional/JIT_Test/src/jit/test/jitt/math/LongMultiply.java index 5de355569ff..b06472ed015 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/LongMultiply.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/LongMultiply.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/LongXOR.java b/test/functional/JIT_Test/src/jit/test/jitt/math/LongXOR.java index 0dfc7dd1585..d2c858db384 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/LongXOR.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/LongXOR.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/intSpecialCompare.java b/test/functional/JIT_Test/src/jit/test/jitt/math/intSpecialCompare.java index d4e6d64354d..c199137512d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/intSpecialCompare.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/intSpecialCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/longCompare.java b/test/functional/JIT_Test/src/jit/test/jitt/math/longCompare.java index 04d91e53cfe..25bc421e4e5 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/longCompare.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/longCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math/longVarCompare.java b/test/functional/JIT_Test/src/jit/test/jitt/math/longVarCompare.java index 89df327cdcf..cbd78ef9b87 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math/longVarCompare.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math/longVarCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteCompare.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteCompare.java index 3eebfb46ced..600fa8bcbb3 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteCompare.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: ByteCompare.java // Testing byte comparisons such as the "==" among byte operands diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteToLong.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteToLong.java index 22ee3d8b65b..d03e7483598 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteToLong.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/ByteToLong.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: ByteToLong.java // Testing the casting of a byte to a long type diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/CharToInt.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/CharToInt.java index 26e24115b51..0df0f4cbd5e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/CharToInt.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/CharToInt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: CharToInt.java // Testing the casting of a byte to an integer type diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntAndLongDivision.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntAndLongDivision.java index 82f81eb3e9d..2bfdc70fe84 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntAndLongDivision.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntAndLongDivision.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntAndLongDivision.java // Testing the division operation among integer and long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTest.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTest.java index d2d7c987368..8615e7e0f47 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntStaticTest.java // Testing the assignment of static integer and static volatile integers diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelper.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelper.java index ee6f962cf34..19711d66f0b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelper.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math2; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelperVolatile.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelperVolatile.java index 7da3617efe9..3f0ffc43527 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelperVolatile.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntStaticTestHelperVolatile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math2; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerANDTest.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerANDTest.java index cd7d8e28001..85e9a2c8bf1 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerANDTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerANDTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerANDTest.java // Testing the AND operation among integer type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerAddition.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerAddition.java index 3172a2642ca..a434d016300 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerAddition.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerAddition.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test IntegerAddition.java // Testing the addition of integers, variable integers, and constant integers diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerCompare.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerCompare.java index 125c25647d5..549fa7598fa 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerCompare.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerCompare.java // Testing the comparison operation among integer operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerMultiply.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerMultiply.java index 101cf597f8a..63d66400bae 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerMultiply.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerMultiply.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerMultiply.java // Testing the multiplication operation among integer type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerSubtraction.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerSubtraction.java index dfa01bd1762..ee7f99e31be 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerSubtraction.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerSubtraction.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerSubtraction.java // Testing the subtraction operation of integer type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByte.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByte.java index b7552f225a2..bbb26baa68a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByte.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByte.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerToByte.java // Testing the casting operation from an integer to a byte type. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByteAndShort.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByteAndShort.java index 799017adfe5..14ac12bd396 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByteAndShort.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToByteAndShort.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerToByteAndShort.java // Testing the conversion from integer to byte and from integer to short. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToFloat.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToFloat.java index f94ff7c5b17..cba295e1ba0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToFloat.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToFloat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerToFloat.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToLong.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToLong.java index 262a0d1dc4d..32b7dd4c49f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToLong.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerToLong.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerToLong.java // Testing the casting operation from integer to long type. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerXOR.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerXOR.java index 1051cb077bb..4a0070160e5 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerXOR.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/IntegerXOR.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: IntegerXOR.java // Testing the XOR operation among integer type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongANDTest.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongANDTest.java index c377ae3503a..ebbbcbb4285 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongANDTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongANDTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongANDTest.java // Testing the AND operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongAddition.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongAddition.java index f72f3f649af..c58e06b37f2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongAddition.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongAddition.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test LongAddition.java // Testing the addition of long type variables and constants diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare.java index 7342620c6b7..66ec6a09da1 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongCompare.java // Testing the comparison ("==") operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare2.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare2.java index 53c3df04184..0cb589147e7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongCompare2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongCompare2.java // Testing the comparison operators among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivision.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivision.java index ce54e997a42..974af697688 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivision.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivision.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongDivision.java // Testing the division operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivisionTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivisionTest1.java index 004827a6d0f..3944aac3b82 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivisionTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongDivisionTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math2; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongMultiply.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongMultiply.java index e12ef148649..98f8f59ea57 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongMultiply.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongMultiply.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongMultiply.java // Testing the multiplication operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongORTest.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongORTest.java index bdae736c8d3..0ed047e745c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongORTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongORTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongORTest.java // Testing the OR ("|") operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongRemainderTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongRemainderTest1.java index 5977b300a15..635b7ce589a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongRemainderTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongRemainderTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.math2; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongSubtraction.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongSubtraction.java index 03972697f11..ca87f974fb4 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongSubtraction.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongSubtraction.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongSubtraction.java // Testing the subtraction operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToFloat.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToFloat.java index de536d5194c..2bfc76811a1 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToFloat.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToFloat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongToFloat.java diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToInteger.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToInteger.java index 9ee379f80ba..383ad1693c9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToInteger.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToInteger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongToInteger.java // Testing the conversion from long to integer type. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToOthersConversion.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToOthersConversion.java index e88272ae4c3..dccf20a855e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToOthersConversion.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongToOthersConversion.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongToOthersConversion.java // Testing the conversion from long type to byte, short, and int. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongXOR.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongXOR.java index 547030989c2..fde2f59e814 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/LongXOR.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/LongXOR.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: LongXOR.java // Testing the XOR operation among long type operand variables, and constants. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/math2/NegationTest.java b/test/functional/JIT_Test/src/jit/test/jitt/math2/NegationTest.java index 42fd67da753..a99e2ce7b16 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/math2/NegationTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/math2/NegationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test file: NegationTest.java // Testing the negation of byte, short, integer, and long type values. diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/AsyncCheck.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/AsyncCheck.java index 44a4567f3cb..b9045882a56 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/AsyncCheck.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/AsyncCheck.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/Constructor.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/Constructor.java index 4528854a201..7347f5332b9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/Constructor.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/Constructor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/S.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/S.java index 6647dddce1d..ca55c9d494b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/S.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/S.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityCompareAndBranch.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityCompareAndBranch.java index 40cfe3281f2..d830b7173ee 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityCompareAndBranch.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityCompareAndBranch.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS1_Strings.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS1_Strings.java index 90d097b76b5..2767b72ad88 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS1_Strings.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS1_Strings.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS2_Strings.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS2_Strings.java index 5012d3739a6..5492f29720c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS2_Strings.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/SanityS2_Strings.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/misc/WriteBarrier.java b/test/functional/JIT_Test/src/jit/test/jitt/misc/WriteBarrier.java index f00b8d5553c..269e0a36d17 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/misc/WriteBarrier.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/misc/WriteBarrier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.misc; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatArgTest.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatArgTest.java index e935182816f..bec88688dc2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatArgTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatArgTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test FloatArgTest.java // Testing the passing of float type arguments and the returning of float type value diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest1.java index d5b96eb7d4a..be882f57501 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test FloatDoubleArgTest1.java // Testing the combination of passing float and double type arguments and testing the return diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest2.java index 86b1125996c..94ba75f2277 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/FloatDoubleArgTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test FloatDoubleArgTest2.java // Testing the combination of passing float and double type arguments and testing the return diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/IntArgTest.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/IntArgTest.java index 21ee8470935..3b958202c90 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/IntArgTest.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/IntArgTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test IntArgTest.java // Testing the passing of integer arguments and the returning of an integer value diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest1.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest1.java index 14375315336..78f4b106cbd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest1.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test LongArgTest1.java // Testing the passing of an integer argument followed by a long argument and testing the return diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest2.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest2.java index ab0bb7c9880..5f22c533b67 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test LongArgTest2.java // Testing the combination of passing 2 integer arguments and a long argument and testing the return diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest3.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest3.java index f9bec7ba5ba..d8b466b9312 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test LongArgTest3.java // Testing the combination of passing 3 integer arguments and a long argument and testing the return diff --git a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest4.java b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest4.java index 9b932ee916d..a0f9f0b1e9e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest4.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/os390/linkage/LongArgTest4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // Test LongArgTest4.java // Testing the combination of passing 2 long arguments and testing the return diff --git a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic.java index 02e4a1e571f..39b4b283953 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.promotion; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic2.java b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic2.java index 6d8e1194ab3..ee86067f956 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.promotion; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic3.java b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic3.java index 4d2151a226c..2d97928588a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.promotion; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic4.java b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic4.java index 3d5d3c22c9b..01faeaa7da9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic4.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteStatic4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.promotion; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteVirt.java b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteVirt.java index 7156efed188..962f5dc3a0f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteVirt.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/promotion/PromoteVirt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.promotion; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/StaticString.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/StaticString.java index 8d9cb9ed601..46faa11d1ce 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/StaticString.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/StaticString.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedClassRef.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedClassRef.java index a17a315b1af..1173d16ea4f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedClassRef.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedClassRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant.java index cef83addc61..bfd32ac82d8 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant2.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant2.java index 033ef857e01..bbe54402fb2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstant2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstructor.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstructor.java index 99fe0fd6341..d9650b85ab0 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstructor.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedConstructor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedFloatConstant.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedFloatConstant.java index fd6c0e5354b..73e85157fb6 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedFloatConstant.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedFloatConstant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField.java index 7ef6b5c5338..4d888eedb90 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField1b.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField1b.java index 292899a181c..439e24936b3 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField1b.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField1b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2.java index 4b90cbb00a5..4df13230c4c 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2b.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2b.java index ad90c41d3c4..719ae1100d7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2b.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField2b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField3.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField3.java index fd385eb4c64..cd76c58caa4 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetField3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetStatic.java index 56270829256..f40b16fda2a 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedGetStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaMethod.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaMethod.java index 7f86595849d..833bf056885 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaMethod.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaStaticMethod.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaStaticMethod.java index 397af6ec2e0..8eab1b0ebc7 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaStaticMethod.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedJavaStaticMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedLongConstant.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedLongConstant.java index b9a2263d41f..7c9f83d8dff 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedLongConstant.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedLongConstant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass.java index 201d6e89b76..5a257b71ef9 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass2.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass2.java index fe26968da9e..de239c2a216 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedNewClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2.java index 15cc442506a..152b33a72ad 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2b.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2b.java index 6b9dde4f425..55d2f48c993 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2b.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField2b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField3.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField3.java index 275c1c318ba..6b15fb8e516 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField3.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutField3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField.java index d7c6c54aac9..e9fa2a3e292 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField2.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField2.java index 0386b5d67da..c15949c0ca8 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedPutStaticField2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedSpecialMethod.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedSpecialMethod.java index d50363009cc..e8e7c45f16d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedSpecialMethod.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedSpecialMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStatic.java index ed0a5d0ad1c..e1f1bc16a52 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField.java index 542999cb9d3..427057666fd 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField2.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField2.java index 59269c2b6cb..d82ba96679b 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField2.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticField2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticMethod.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticMethod.java index 941100aaa0a..81bd26289ca 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticMethod.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedStaticMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedVirtualMethod.java b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedVirtualMethod.java index 94b586f91fa..b881e4c012d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedVirtualMethod.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/resolves/UnresolvedVirtualMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.resolves; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve01.java b/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve01.java index e4e68d6065a..b941bcaef5d 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve01.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.sieve; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve02.java b/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve02.java index 671a355e272..ccc631547d2 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve02.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.sieve; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve03.java b/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve03.java index d130cd3e31e..abdbf036c06 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve03.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/sieve/Sieve03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.sieve; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStatic.java b/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStatic.java index 7e760ef033e..ee4267b269e 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStatic.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.transitions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStaticI5I.java b/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStaticI5I.java index 2e8c45ba282..531e3b79f3f 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStaticI5I.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpStaticI5I.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.transitions; diff --git a/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpVirt.java b/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpVirt.java index 0477f116be5..4bf534ec515 100644 --- a/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpVirt.java +++ b/test/functional/JIT_Test/src/jit/test/jitt/transitions/JitInterpVirt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.jitt.transitions; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/Context.java b/test/functional/JIT_Test/src/jit/test/loopReduction/Context.java index f6321fa5130..2d33862da34 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/Context.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/Context.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong.java b/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong.java index 84ce5f593ce..0acf1762068 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; public class CountDecimalDigitLong extends base { diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong2.java b/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong2.java index 8b13cd665da..179bf49f75d 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong2.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/CountDecimalDigitLong2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCMP2CompareTo.java b/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCMP2CompareTo.java index 5ce8205d00c..7adad1f40fd 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCMP2CompareTo.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCMP2CompareTo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCPYChar2Byte2.java b/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCPYChar2Byte2.java index c613fd92afb..01275c73be0 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCPYChar2Byte2.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/MEMCPYChar2Byte2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/Main.java b/test/functional/JIT_Test/src/jit/test/loopReduction/Main.java index a2004cfa51e..700c41108db 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/Main.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/TROTArray.java b/test/functional/JIT_Test/src/jit/test/loopReduction/TROTArray.java index ac83e983689..237ead1b694 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/TROTArray.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/TROTArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/TRTNestedArray.java b/test/functional/JIT_Test/src/jit/test/loopReduction/TRTNestedArray.java index 5acaf55bb20..2406daeb44a 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/TRTNestedArray.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/TRTNestedArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/TRTOArray.java b/test/functional/JIT_Test/src/jit/test/loopReduction/TRTOArray.java index b163d89389f..1fea604b3db 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/TRTOArray.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/TRTOArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/arraycompare.java b/test/functional/JIT_Test/src/jit/test/loopReduction/arraycompare.java index 5a850045fbc..a39514e066d 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/arraycompare.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/arraycompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/arraycopy.java b/test/functional/JIT_Test/src/jit/test/loopReduction/arraycopy.java index 5b84b64527c..9128e5eb02f 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/arraycopy.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/arraycopy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/arrayset.java b/test/functional/JIT_Test/src/jit/test/loopReduction/arrayset.java index 2b5c04826b9..89e0285b4ea 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/arrayset.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/arrayset.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/arraytranslateandtest.java b/test/functional/JIT_Test/src/jit/test/loopReduction/arraytranslateandtest.java index 894f6b8877f..fb0e6aa15b1 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/arraytranslateandtest.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/arraytranslateandtest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/base.java b/test/functional/JIT_Test/src/jit/test/loopReduction/base.java index 94a408c300f..6ade189a7e9 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/base.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/base.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/bigEndianByte2CharMemCpy.java b/test/functional/JIT_Test/src/jit/test/loopReduction/bigEndianByte2CharMemCpy.java index d13e1ee41dd..f4ce3011f3f 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/bigEndianByte2CharMemCpy.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/bigEndianByte2CharMemCpy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/bitMemOp.java b/test/functional/JIT_Test/src/jit/test/loopReduction/bitMemOp.java index fd284911af0..5dc7e04e39b 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/bitMemOp.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/bitMemOp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCmp.java b/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCmp.java index f57682b2bf7..547d1c696e0 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCmp.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCmp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // reduce loop to CLCL ; // 1-byte compare diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCpy.java b/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCpy.java index bbcd43ef7f6..1b7ec31393d 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCpy.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemCpy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemSet.java b/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemSet.java index 447832206f5..d3b12902d64 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemSet.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/byteMemSet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/bytearraywrite.java b/test/functional/JIT_Test/src/jit/test/loopReduction/bytearraywrite.java index 5c546d07f59..218b63b13b9 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/bytearraywrite.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/bytearraywrite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/char2ByteMemCpy.java b/test/functional/JIT_Test/src/jit/test/loopReduction/char2ByteMemCpy.java index 639625aa633..7a319b9229b 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/char2ByteMemCpy.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/char2ByteMemCpy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/charMemCmp.java b/test/functional/JIT_Test/src/jit/test/loopReduction/charMemCmp.java index 633c2ab3542..36970b3fb47 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/charMemCmp.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/charMemCmp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // reduce loop to CLCL ; // 2-byte compare diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTROT.java b/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTROT.java index 80a82a2ce0d..14637d4c9d6 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTROT.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTROT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTRTO.java b/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTRTO.java index 23fe2b4e3eb..23ca447bd2f 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTRTO.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/copyingTRTO.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/countDecimalDigitInt.java b/test/functional/JIT_Test/src/jit/test/loopReduction/countDecimalDigitInt.java index a090bfb32ff..d1a452fb3bb 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/countDecimalDigitInt.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/countDecimalDigitInt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/idiomTests.java b/test/functional/JIT_Test/src/jit/test/loopReduction/idiomTests.java index c08a208fa77..c92ac53c314 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/idiomTests.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/idiomTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/littleEndianByte2CharMemCpy.java b/test/functional/JIT_Test/src/jit/test/loopReduction/littleEndianByte2CharMemCpy.java index e083b68723e..a35f7c89e59 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/littleEndianByte2CharMemCpy.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/littleEndianByte2CharMemCpy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCmp.java b/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCmp.java index 882ce6f33a5..b8a2c4fa5b5 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCmp.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCmp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // reduce loop to CLCL ; // 8-byte compare diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCpy.java b/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCpy.java index 753e25de7e5..3280651daa8 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCpy.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/longMemCpy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/simpleByteTRT.java b/test/functional/JIT_Test/src/jit/test/loopReduction/simpleByteTRT.java index a6391a43211..d3eeb8924e3 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/simpleByteTRT.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/simpleByteTRT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/simpleCharTRT.java b/test/functional/JIT_Test/src/jit/test/loopReduction/simpleCharTRT.java index 53998a2e148..02eabf5e6b2 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/simpleCharTRT.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/simpleCharTRT.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/loopReduction/writeUTF.java b/test/functional/JIT_Test/src/jit/test/loopReduction/writeUTF.java index 07221fb8d00..fe4adfe6ed0 100644 --- a/test/functional/JIT_Test/src/jit/test/loopReduction/writeUTF.java +++ b/test/functional/JIT_Test/src/jit/test/loopReduction/writeUTF.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.loopReduction; diff --git a/test/functional/JIT_Test/src/jit/test/ra/TestOOLSpill31Bit.java b/test/functional/JIT_Test/src/jit/test/ra/TestOOLSpill31Bit.java index f50086d5d9c..f07ba2ca441 100644 --- a/test/functional/JIT_Test/src/jit/test/ra/TestOOLSpill31Bit.java +++ b/test/functional/JIT_Test/src/jit/test/ra/TestOOLSpill31Bit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.ra; diff --git a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaIntegerAndLongToString.java b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaIntegerAndLongToString.java index df7b5b9b89a..99d56244e59 100644 --- a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaIntegerAndLongToString.java +++ b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaIntegerAndLongToString.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.recognizedMethod; diff --git a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangMath.java b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangMath.java index fe04233d452..3dd828c9b54 100644 --- a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangMath.java +++ b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangMath.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.recognizedMethod; diff --git a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStrictMath.java b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStrictMath.java index b50e36e50df..802e381375a 100644 --- a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStrictMath.java +++ b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStrictMath.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.recognizedMethod; diff --git a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringCodingEncodeASCII.java b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringCodingEncodeASCII.java index 4f7ab54594a..e2d0b330058 100644 --- a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringCodingEncodeASCII.java +++ b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringCodingEncodeASCII.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.recognizedMethod; diff --git a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringLatin1.java b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringLatin1.java index b7c2a853392..a0c8b294422 100644 --- a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringLatin1.java +++ b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestJavaLangStringLatin1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.recognizedMethod; diff --git a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestRecognizedCallTransformer.java b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestRecognizedCallTransformer.java index ebb22a07422..e7c768479cd 100644 --- a/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestRecognizedCallTransformer.java +++ b/test/functional/JIT_Test/src/jit/test/recognizedMethod/TestRecognizedCallTransformer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.recognizedMethod; diff --git a/test/functional/JIT_Test/src/jit/test/stringconcat/StringConcatTest.java b/test/functional/JIT_Test/src/jit/test/stringconcat/StringConcatTest.java index 677ed9b4caf..735fded7034 100644 --- a/test/functional/JIT_Test/src/jit/test/stringconcat/StringConcatTest.java +++ b/test/functional/JIT_Test/src/jit/test/stringconcat/StringConcatTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.stringconcat; diff --git a/test/functional/JIT_Test/src/jit/test/tr/BNDCHKSimplify/BNDCHKSimplifyTest.java b/test/functional/JIT_Test/src/jit/test/tr/BNDCHKSimplify/BNDCHKSimplifyTest.java index 68a91c11753..dd65f804480 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/BNDCHKSimplify/BNDCHKSimplifyTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/BNDCHKSimplify/BNDCHKSimplifyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.BNDCHKSimplify; diff --git a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDArithmeticTest.java b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDArithmeticTest.java index d42eeba5e2c..f0232395994 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDArithmeticTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDArithmeticTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.BigDecimal; diff --git a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDCompareTest.java b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDCompareTest.java index ee2f928fb65..a44fd9ed592 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDCompareTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDCompareTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.BigDecimal; diff --git a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDEncodingTest.java b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDEncodingTest.java index 5ab9eae5495..74b03f6086e 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDEncodingTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDEncodingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.BigDecimal; diff --git a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDRoundTest.java b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDRoundTest.java index d3eca699bdb..45a92487792 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDRoundTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDRoundTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.BigDecimal; diff --git a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDSerializationTest.java b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDSerializationTest.java index a85f2b0775d..0f0ef7bd4ee 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDSerializationTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/BigDecimal/BDSerializationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.BigDecimal; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyAdd.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyAdd.java index d0fb19bf448..4d5929325c5 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyAdd.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyAdd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyMul.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyMul.java index 72b27bf42c6..a03072b9753 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyMul.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyMul.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyRem.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyRem.java index e80e2c31669..84ae0e795bb 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyRem.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifyRem.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifySub.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifySub.java index 6e4e4ce585e..8fedc9b6043 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifySub.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/FloatSimplifySub.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/TestFsqrt.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/TestFsqrt.java index 243dee8116e..1a8dc8d2406 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/TestFsqrt.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/TestFsqrt.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testdmadd.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testdmadd.java index 528149f560b..204e655db0f 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testdmadd.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testdmadd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testfmadd.java b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testfmadd.java index b73c356a8d2..ad322eadb75 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testfmadd.java +++ b/test/functional/JIT_Test/src/jit/test/tr/FPSimplify/Testfmadd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.FPSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/LockTestCase.java b/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/LockTestCase.java index 9a7d09bd6f0..10466a5224e 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/LockTestCase.java +++ b/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/LockTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.MonitorElimination; diff --git a/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Suite.java b/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Suite.java index 9684620c861..fc2ca36cc0e 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Suite.java +++ b/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Suite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.MonitorElimination; diff --git a/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Unbalanced.j b/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Unbalanced.j index 970cbda7d03..fec7ebed3ca 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Unbalanced.j +++ b/test/functional/JIT_Test/src/jit/test/tr/MonitorElimination/Unbalanced.j @@ -18,7 +18,7 @@ ; [1] https://www.gnu.org/software/classpath/license.html ; [2] https://openjdk.org/legal/assembly-exception.html ; -; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +; SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 .source Unbalanced.j .class public tr/test/MonitorElimination/Unbalanced diff --git a/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDCommonedAddressTest.java b/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDCommonedAddressTest.java index d536e3e79b6..44d83b995c8 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDCommonedAddressTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDCommonedAddressTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.SIMDOpts; diff --git a/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDOptTest.java b/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDOptTest.java index 22f097ce172..bfe276a7a3e 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDOptTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/SIMDOpts/SIMDOptTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.SIMDOpts; diff --git a/test/functional/JIT_Test/src/jit/test/tr/SeqLoadSimplificationTest.java b/test/functional/JIT_Test/src/jit/test/tr/SeqLoadSimplificationTest.java index 8e44c8d3c68..cf79d948bcc 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/SeqLoadSimplificationTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/SeqLoadSimplificationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr; diff --git a/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/ArithmeticTests.java b/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/ArithmeticTests.java index fc5cc1c596b..583cda8c78a 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/ArithmeticTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/ArithmeticTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.VPTypeTests; diff --git a/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/IC1.java b/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/IC1.java index b4b1bd1386c..b461e135f11 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/IC1.java +++ b/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/IC1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.VPTypeTests; diff --git a/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/cTypeTests.java b/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/cTypeTests.java index 5b6ddff894c..0f7059bc5fa 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/cTypeTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/VPTypeTests/cTypeTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.VPTypeTests; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/InnerPreexistence.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/InnerPreexistence.java index cbbbe3d12ba..7db379e78dd 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/InnerPreexistence.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/InnerPreexistence.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest2.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest2.java index 5bed6ed987f..2b184bcdf0a 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest2.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest3.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest3.java index 9b024848faf..c16fde2e420 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest3.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTest3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTests.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTests.java index c7e7c2425ca..12e8302a88a 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/PreexistenceTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/TestOverridden.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/TestOverridden.java index 97782d1df64..339df2fe34e 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/TestOverridden.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/TestOverridden.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/VirtualGuardTest.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/VirtualGuardTest.java index 9ca9b0343c7..1ba6d6cac62 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/VirtualGuardTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/VirtualGuardTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/util/Notifiable.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/util/Notifiable.java index 1c61ef527af..516cd10ee74 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/util/Notifiable.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/util/Notifiable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable.util; diff --git a/test/functional/JIT_Test/src/jit/test/tr/chtable/util/NotifyTask.java b/test/functional/JIT_Test/src/jit/test/tr/chtable/util/NotifyTask.java index f76aa62f3d1..111f644d0d2 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/chtable/util/NotifyTask.java +++ b/test/functional/JIT_Test/src/jit/test/tr/chtable/util/NotifyTask.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.chtable.util; diff --git a/test/functional/JIT_Test/src/jit/test/tr/decomposition/IntegerMultiplyDecomposer.java b/test/functional/JIT_Test/src/jit/test/tr/decomposition/IntegerMultiplyDecomposer.java index 3f2488f8246..f8b16505315 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/decomposition/IntegerMultiplyDecomposer.java +++ b/test/functional/JIT_Test/src/jit/test/tr/decomposition/IntegerMultiplyDecomposer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.decomposition; diff --git a/test/functional/JIT_Test/src/jit/test/tr/explicitNewInit/ExplicitNewInitTest.java b/test/functional/JIT_Test/src/jit/test/tr/explicitNewInit/ExplicitNewInitTest.java index 5e2c14d32a9..9c54d0a8e5c 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/explicitNewInit/ExplicitNewInitTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/explicitNewInit/ExplicitNewInitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* tests/junit/tr/test/explicitNewInit/ExplicitNewInitTest.java, jit.test.trs, tr.dev */ package jit.test.tr.explicitNewInit; diff --git a/test/functional/JIT_Test/src/jit/test/tr/findLeftMostOne/findLeftMostOneTests.java b/test/functional/JIT_Test/src/jit/test/tr/findLeftMostOne/findLeftMostOneTests.java index 777bbe1558b..1ee8df7712f 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/findLeftMostOne/findLeftMostOneTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/findLeftMostOne/findLeftMostOneTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.findLeftMostOne; diff --git a/test/functional/JIT_Test/src/jit/test/tr/fprToGpr/fprToGprTests.java b/test/functional/JIT_Test/src/jit/test/tr/fprToGpr/fprToGprTests.java index c87f9e4cca9..c9e4e6e3148 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/fprToGpr/fprToGprTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/fprToGpr/fprToGprTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.fprToGpr; diff --git a/test/functional/JIT_Test/src/jit/test/tr/ipa/IpaTest.java b/test/functional/JIT_Test/src/jit/test/tr/ipa/IpaTest.java index 47ffd38ab9f..159d094d28d 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/ipa/IpaTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/ipa/IpaTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.ipa; diff --git a/test/functional/JIT_Test/src/jit/test/tr/liveMonitor/monTests.java b/test/functional/JIT_Test/src/jit/test/tr/liveMonitor/monTests.java index ba6473868c1..5cb85b22971 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/liveMonitor/monTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/liveMonitor/monTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.liveMonitor; diff --git a/test/functional/JIT_Test/src/jit/test/tr/loadReverse/loadReverseTests.java b/test/functional/JIT_Test/src/jit/test/tr/loadReverse/loadReverseTests.java index 585987599dc..406d80c9177 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loadReverse/loadReverseTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/loadReverse/loadReverseTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.loadReverse; diff --git a/test/functional/JIT_Test/src/jit/test/tr/longAdd/LongAddTest.java b/test/functional/JIT_Test/src/jit/test/tr/longAdd/LongAddTest.java index cee874625c7..98d0584433a 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/longAdd/LongAddTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/longAdd/LongAddTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.longAdd; diff --git a/test/functional/JIT_Test/src/jit/test/tr/longDivision/LongDivisionTests.java b/test/functional/JIT_Test/src/jit/test/tr/longDivision/LongDivisionTests.java index 49c20099635..b4a922aa2a6 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/longDivision/LongDivisionTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/longDivision/LongDivisionTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.longDivision; diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/Main.java b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/Main.java index c87b4d93887..98a478478db 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/Main.java +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // loop replicator sample testcase package jit.test.tr.loopReplicator; diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/loopRep.java b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/loopRep.java index c78cc0b13ea..538b6336a04 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/loopRep.java +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/loopRep.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.loopReplicator; diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_run.sh b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_run.sh index aebf677533f..7a1d0f33af6 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_run.sh +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_run.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # jitopt="-Xjit:verbose,noJitUntilMain" diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_runwin.bat b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_runwin.bat index f7a1788195a..b20dd3a9139 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_runwin.bat +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/lr_runwin.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem @setlocal diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_run.sh b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_run.sh index c7b41c3eb0f..30b97fbd1df 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_run.sh +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_run.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # jitopt="-Xjit:verbose,noJitUntilMain" diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_runwin.bat b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_runwin.bat index 96a8acd6169..7d2444add4c 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_runwin.bat +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/main_runwin.bat @@ -20,7 +20,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem if "%1"=="d" ( diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/ocif.xml b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/ocif.xml index bf3834ffa67..e0b77bc11a0 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/ocif.xml +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/ocif.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/test002.java b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/test002.java index b866d3d2107..b20067e2b0f 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/test002.java +++ b/test/functional/JIT_Test/src/jit/test/tr/loopReplicator/test002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.loopReplicator; diff --git a/test/functional/JIT_Test/src/jit/test/tr/loopTransfer/cLoopTests.java b/test/functional/JIT_Test/src/jit/test/tr/loopTransfer/cLoopTests.java index e78b1805286..7791c228fea 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/loopTransfer/cLoopTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/loopTransfer/cLoopTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.loopTransfer; diff --git a/test/functional/JIT_Test/src/jit/test/tr/mathSimplify/PowTest.java b/test/functional/JIT_Test/src/jit/test/tr/mathSimplify/PowTest.java index 4765f3e1599..44ddbc49280 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/mathSimplify/PowTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/mathSimplify/PowTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.mathSimplify; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/newinstance/NewInstanceTests.java b/test/functional/JIT_Test/src/jit/test/tr/newinstance/NewInstanceTests.java index cb395637ab0..39b19382cf3 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/newinstance/NewInstanceTests.java +++ b/test/functional/JIT_Test/src/jit/test/tr/newinstance/NewInstanceTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.newinstance; diff --git a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Abstract.java b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Abstract.java index 7c923483ee3..1b669ab7fa7 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Abstract.java +++ b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Abstract.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.newinstance.pkg; diff --git a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Interface.java b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Interface.java index d7aca512422..a2f6dfaf1d9 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Interface.java +++ b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/Interface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.newinstance.pkg; diff --git a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/ProtCtor.java b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/ProtCtor.java index 43b03e4c90b..af7e35f609b 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/ProtCtor.java +++ b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/ProtCtor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.newinstance.pkg; diff --git a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/PublicCtor.java b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/PublicCtor.java index 1e805f3d109..bb049c56af1 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/PublicCtor.java +++ b/test/functional/JIT_Test/src/jit/test/tr/newinstance/pkg/PublicCtor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.newinstance.pkg; diff --git a/test/functional/JIT_Test/src/jit/test/tr/signExtensionA/SignExtElimTest.java b/test/functional/JIT_Test/src/jit/test/tr/signExtensionA/SignExtElimTest.java index 112fe177d10..6e8885c39c4 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/signExtensionA/SignExtElimTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/signExtensionA/SignExtElimTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.signExtensionA; import org.testng.annotations.Test; diff --git a/test/functional/JIT_Test/src/jit/test/tr/stringPeephole/BigDecimalToStringTest.java b/test/functional/JIT_Test/src/jit/test/tr/stringPeephole/BigDecimalToStringTest.java index 8125aa23f24..f55396655f9 100644 --- a/test/functional/JIT_Test/src/jit/test/tr/stringPeephole/BigDecimalToStringTest.java +++ b/test/functional/JIT_Test/src/jit/test/tr/stringPeephole/BigDecimalToStringTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.tr.stringPeephole; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Allocation.java b/test/functional/JIT_Test/src/jit/test/vich/Allocation.java index 4d94bdaf204..8c8e11bdeb5 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Allocation.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Allocation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/CurrentTimeMillis.java b/test/functional/JIT_Test/src/jit/test/vich/CurrentTimeMillis.java index 4eff27d2a2b..5018802d2ee 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/CurrentTimeMillis.java +++ b/test/functional/JIT_Test/src/jit/test/vich/CurrentTimeMillis.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/EqualsImplementations.java b/test/functional/JIT_Test/src/jit/test/vich/EqualsImplementations.java index 4b6e63828be..6dd10fb28c7 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/EqualsImplementations.java +++ b/test/functional/JIT_Test/src/jit/test/vich/EqualsImplementations.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Exceptions.java b/test/functional/JIT_Test/src/jit/test/vich/Exceptions.java index bbc0d5fc843..db8688dd027 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Exceptions.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Exceptions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Fibonacci.java b/test/functional/JIT_Test/src/jit/test/vich/Fibonacci.java index beccbd025d1..3143b9a9d26 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Fibonacci.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Fibonacci.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/GC.java b/test/functional/JIT_Test/src/jit/test/vich/GC.java index c569cb6a347..5a9a1fa7325 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/GC.java +++ b/test/functional/JIT_Test/src/jit/test/vich/GC.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/HashEfficiencyTest.java b/test/functional/JIT_Test/src/jit/test/vich/HashEfficiencyTest.java index 828b316e756..a5442429634 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/HashEfficiencyTest.java +++ b/test/functional/JIT_Test/src/jit/test/vich/HashEfficiencyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Hashtable.java b/test/functional/JIT_Test/src/jit/test/vich/Hashtable.java index 453c5420c44..5e2499ca5ce 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Hashtable.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Hashtable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/JNI.java b/test/functional/JIT_Test/src/jit/test/vich/JNI.java index 9b707d61311..8ba18ca87ab 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/JNI.java +++ b/test/functional/JIT_Test/src/jit/test/vich/JNI.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/JNIArray.java b/test/functional/JIT_Test/src/jit/test/vich/JNIArray.java index fb103b91435..9c2bf6c491a 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/JNIArray.java +++ b/test/functional/JIT_Test/src/jit/test/vich/JNIArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/JNICallIn.java b/test/functional/JIT_Test/src/jit/test/vich/JNICallIn.java index 379858998b9..90310370b2a 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/JNICallIn.java +++ b/test/functional/JIT_Test/src/jit/test/vich/JNICallIn.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/JNIFields.java b/test/functional/JIT_Test/src/jit/test/vich/JNIFields.java index 8b7d3b5ac0e..64d92d0c218 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/JNIFields.java +++ b/test/functional/JIT_Test/src/jit/test/vich/JNIFields.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/JNILocalRef.java b/test/functional/JIT_Test/src/jit/test/vich/JNILocalRef.java index 2b3d70a2b2d..404474c82f5 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/JNILocalRef.java +++ b/test/functional/JIT_Test/src/jit/test/vich/JNILocalRef.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/JNIObjectArray.java b/test/functional/JIT_Test/src/jit/test/vich/JNIObjectArray.java index 9e71c92d7f7..a36df47c761 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/JNIObjectArray.java +++ b/test/functional/JIT_Test/src/jit/test/vich/JNIObjectArray.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/MethodInvocation.java b/test/functional/JIT_Test/src/jit/test/vich/MethodInvocation.java index 5f04edde806..b05ed5d9852 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/MethodInvocation.java +++ b/test/functional/JIT_Test/src/jit/test/vich/MethodInvocation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Microbench.java b/test/functional/JIT_Test/src/jit/test/vich/Microbench.java index 98968c97a0a..7af876388cf 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Microbench.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Microbench.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/ReadTest.java b/test/functional/JIT_Test/src/jit/test/vich/ReadTest.java index e8521956fa5..c36de8627b1 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/ReadTest.java +++ b/test/functional/JIT_Test/src/jit/test/vich/ReadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Strings.java b/test/functional/JIT_Test/src/jit/test/vich/Strings.java index 99c1fbbba9c..09f9edeaf4b 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Strings.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Strings.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/TestInterface.java b/test/functional/JIT_Test/src/jit/test/vich/TestInterface.java index 45d3c714741..e101eb355b4 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/TestInterface.java +++ b/test/functional/JIT_Test/src/jit/test/vich/TestInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/Threads.java b/test/functional/JIT_Test/src/jit/test/vich/Threads.java index d00293cab04..dade06f932f 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/Threads.java +++ b/test/functional/JIT_Test/src/jit/test/vich/Threads.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich; diff --git a/test/functional/JIT_Test/src/jit/test/vich/utils/Timer.java b/test/functional/JIT_Test/src/jit/test/vich/utils/Timer.java index 60c407e8fff..fb0016ccc96 100644 --- a/test/functional/JIT_Test/src/jit/test/vich/utils/Timer.java +++ b/test/functional/JIT_Test/src/jit/test/vich/utils/Timer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jit.test.vich.utils; diff --git a/test/functional/JIT_Test/src_stub/tr/test/MonitorElimination/Unbalanced.java b/test/functional/JIT_Test/src_stub/tr/test/MonitorElimination/Unbalanced.java index fd80a83f218..683f94b44ca 100644 --- a/test/functional/JIT_Test/src_stub/tr/test/MonitorElimination/Unbalanced.java +++ b/test/functional/JIT_Test/src_stub/tr/test/MonitorElimination/Unbalanced.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package tr.test.MonitorElimination; diff --git a/test/functional/JIT_Test/testng.xml b/test/functional/JIT_Test/testng.xml index faa9ac3df1d..cdf2fdb598a 100644 --- a/test/functional/JIT_Test/testng.xml +++ b/test/functional/JIT_Test/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JIT_Test/wsddbuild.xml b/test/functional/JIT_Test/wsddbuild.xml index 075a7570d8e..492111dc090 100644 --- a/test/functional/JIT_Test/wsddbuild.xml +++ b/test/functional/JIT_Test/wsddbuild.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JLM_Tests/build.xml b/test/functional/JLM_Tests/build.xml index b5b15421989..8840e495e1a 100644 --- a/test/functional/JLM_Tests/build.xml +++ b/test/functional/JLM_Tests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JLM_Tests/playlist.xml b/test/functional/JLM_Tests/playlist.xml index 6c0eb466e95..e10b899c904 100644 --- a/test/functional/JLM_Tests/playlist.xml +++ b/test/functional/JLM_Tests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/MemoryExhauster.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/MemoryExhauster.java index 7c9302b8a3c..99d3c08d14d 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/MemoryExhauster.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/MemoryExhauster.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test1.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test1.java index d529a47da0f..c425db17aba 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test1.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test2.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test2.java index 0b6190d010c..3bb988bfcc4 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test2.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/OOMGenerator_RAS_Test2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/RemoteTestServer.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/RemoteTestServer.java index 91ad768c159..cef123ecccb 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/RemoteTestServer.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/RemoteTestServer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest.java index 58e3ca5af7b..4e9df845d76 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest_GC_Only.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest_GC_Only.java index bc4d795eb90..eb30eef4eb9 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest_GC_Only.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxAdvanceTest_GC_Only.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxLocalTest.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxLocalTest.java index 3d656b23c3b..c627a9d1762 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxLocalTest.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxLocalTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest1.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest1.java index 64d65f385ae..c36faf6b570 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest1.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest2.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest2.java index dea3083e2b5..0c0650feb20 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest2.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRASTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRemoteTest.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRemoteTest.java index 0122205a188..3611445ad5c 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRemoteTest.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/SoftmxRemoteTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/j9vm/test/softmx/TestNatives.java b/test/functional/JLM_Tests/src/j9vm/test/softmx/TestNatives.java index 202085d2a10..67ba587b512 100644 --- a/test/functional/JLM_Tests/src/j9vm/test/softmx/TestNatives.java +++ b/test/functional/JLM_Tests/src/j9vm/test/softmx/TestNatives.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/AllManagementTests.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/AllManagementTests.java index 407b520fa55..8d3a9e673dd 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/AllManagementTests.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/AllManagementTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteProcess.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteProcess.java index 77c58d7848a..582f84ff8ff 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteProcess.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteProcess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteServer.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteServer.java index 3a84a041ea9..278f4c9588a 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteServer.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/RemoteServer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestClassLoadingMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestClassLoadingMXBean.java index 51ad0734fe4..389d64069c2 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestClassLoadingMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestClassLoadingMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestCompilationMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestCompilationMXBean.java index e8d362d0a81..cf8c80d8bc3 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestCompilationMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestCompilationMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestExample.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestExample.java index aa5c8041a3f..be2a5358295 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestExample.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestGarbageCollectorMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestGarbageCollectorMXBean.java index 69722165c57..8a7a87738ea 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestGarbageCollectorMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestGarbageCollectorMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestJvmCpuMonitorMXBeanEx.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestJvmCpuMonitorMXBeanEx.java index e18e745f240..00170476124 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestJvmCpuMonitorMXBeanEx.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestJvmCpuMonitorMXBeanEx.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLockInfo.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLockInfo.java index 5adb88532a3..6c34eaa839f 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLockInfo.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLockInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLoggingMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLoggingMXBean.java index 8b0ab1c0214..9af2434ef00 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLoggingMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestLoggingMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementFactory.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementFactory.java index 1f3007832a8..a01cb88f82c 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementFactory.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementPermission.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementPermission.java index 7de268f739a..68dddc1f7ea 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementPermission.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementPermission.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementUtils.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementUtils.java index ad8c1557caa..da9836d70a1 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementUtils.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestManagementUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryMXBean.java index dd7dec2a020..ba79dc9e947 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryManagerMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryManagerMXBean.java index c9be35a3402..2d537ea33b6 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryManagerMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryManagerMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryNotificationInfo.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryNotificationInfo.java index 5d6043d3f68..03042acce89 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryNotificationInfo.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryNotificationInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryPoolMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryPoolMXBean.java index 79faf28b463..eba06186ff0 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryPoolMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryPoolMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryUsage.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryUsage.java index d64264a2ca6..f6839a811c5 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryUsage.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMemoryUsage.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMisc.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMisc.java index 09535575c96..46407f13acb 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMisc.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMisc.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMonitorInfo.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMonitorInfo.java index 9e0647b343d..860204ec1e2 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMonitorInfo.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestMonitorInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOpenJ9DiagnosticsMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOpenJ9DiagnosticsMXBean.java index 8d49f723de0..6eaf24f7676 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOpenJ9DiagnosticsMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOpenJ9DiagnosticsMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOperatingSystemMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOperatingSystemMXBean.java index 2fcacd25716..686c269110d 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOperatingSystemMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestOperatingSystemMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression.java index 969486e4285..a94c18493c5 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression_SM.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression_SM.java index 95debe50796..3ebea6ccb32 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression_SM.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRegression_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRuntimeMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRuntimeMXBean.java index 0b54ac2fab2..57abfa22286 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRuntimeMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestRuntimeMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean.java index 37526530328..ac807857f09 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean_SM.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean_SM.java index 58aaaa95d7b..f97a2008db3 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean_SM.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestSharedClassMemoryMXBean_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestThreadMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestThreadMXBean.java index a79962bf15a..32a6f917ec8 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestThreadMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestThreadMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestUtil.java b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestUtil.java index 2d3fac672f2..544f1eda765 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestUtil.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/java/lang/management/TestUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/GuestOSMXBeanTest.java b/test/functional/JLM_Tests/src/org/openj9/test/management/GuestOSMXBeanTest.java index 4e78572332d..721ae432359 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/GuestOSMXBeanTest.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/GuestOSMXBeanTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/JvmCpuMonitorMXBeanTest.java b/test/functional/JLM_Tests/src/org/openj9/test/management/JvmCpuMonitorMXBeanTest.java index 5207cbea604..aadcf790da3 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/JvmCpuMonitorMXBeanTest.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/JvmCpuMonitorMXBeanTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/ProcessLocking.java b/test/functional/JLM_Tests/src/org/openj9/test/management/ProcessLocking.java index 7ed1c0d05b6..37b29f5f67c 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/ProcessLocking.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/ProcessLocking.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteMonitor.java b/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteMonitor.java index 3f902fa71f9..db19eca24eb 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteMonitor.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteMonitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteServer.java b/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteServer.java index 9f2ab9657fc..ba92a8ea382 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteServer.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/RemoteServer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/TestGetSystemCpuLoad.java b/test/functional/JLM_Tests/src/org/openj9/test/management/TestGetSystemCpuLoad.java index 6cde2bb8a79..ecaca770f3f 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/TestGetSystemCpuLoad.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/TestGetSystemCpuLoad.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/TestOperatingSystemMXBean.java b/test/functional/JLM_Tests/src/org/openj9/test/management/TestOperatingSystemMXBean.java index b3ef6aaa877..f55da8cd6c1 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/TestOperatingSystemMXBean.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/TestOperatingSystemMXBean.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/util/BusyThread.java b/test/functional/JLM_Tests/src/org/openj9/test/management/util/BusyThread.java index 24263c2b214..96717f3dbf9 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/util/BusyThread.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/util/BusyThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management.util; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/util/ChildWatchdog.java b/test/functional/JLM_Tests/src/org/openj9/test/management/util/ChildWatchdog.java index 5a36fefa685..a66a5ffe1e3 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/util/ChildWatchdog.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/util/ChildWatchdog.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management.util; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/management/util/WorkerThread.java b/test/functional/JLM_Tests/src/org/openj9/test/management/util/WorkerThread.java index ccac9ebad45..920f58b3fdd 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/management/util/WorkerThread.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/management/util/WorkerThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management.util; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/softmx/HelperClass.java b/test/functional/JLM_Tests/src/org/openj9/test/softmx/HelperClass.java index 2a1ea78f7f5..3543fbdafb0 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/softmx/HelperClass.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/softmx/HelperClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.softmx; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/softmx/SoftmxUserScenarioTest.java b/test/functional/JLM_Tests/src/org/openj9/test/softmx/SoftmxUserScenarioTest.java index 02639796877..40215735642 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/softmx/SoftmxUserScenarioTest.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/softmx/SoftmxUserScenarioTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.softmx; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/util/process/ContainerProcess.java b/test/functional/JLM_Tests/src/org/openj9/test/util/process/ContainerProcess.java index 6babcdc6a74..d86130d3623 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/util/process/ContainerProcess.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/util/process/ContainerProcess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util.process; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/util/process/Packet.java b/test/functional/JLM_Tests/src/org/openj9/test/util/process/Packet.java index a17698b73eb..3cff2317ede 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/util/process/Packet.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/util/process/Packet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util.process; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/util/process/ProcessRunner.java b/test/functional/JLM_Tests/src/org/openj9/test/util/process/ProcessRunner.java index 34f8b8c2d45..b15fa4304bd 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/util/process/ProcessRunner.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/util/process/ProcessRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util.process; diff --git a/test/functional/JLM_Tests/src/org/openj9/test/util/process/Task.java b/test/functional/JLM_Tests/src/org/openj9/test/util/process/Task.java index 0f33ba11cf9..381cfff00e9 100644 --- a/test/functional/JLM_Tests/src/org/openj9/test/util/process/Task.java +++ b/test/functional/JLM_Tests/src/org/openj9/test/util/process/Task.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util.process; diff --git a/test/functional/JLM_Tests/src_80/org/openj9/test/java/lang/management/TestThreadInfo.java b/test/functional/JLM_Tests/src_80/org/openj9/test/java/lang/management/TestThreadInfo.java index 965afeb6963..a2e930acb4c 100644 --- a/test/functional/JLM_Tests/src_80/org/openj9/test/java/lang/management/TestThreadInfo.java +++ b/test/functional/JLM_Tests/src_80/org/openj9/test/java/lang/management/TestThreadInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/src_90/org/openj9/test/java/lang/management/TestThreadInfo.java b/test/functional/JLM_Tests/src_90/org/openj9/test/java/lang/management/TestThreadInfo.java index ba6d1d31742..0dbf4266abe 100644 --- a/test/functional/JLM_Tests/src_90/org/openj9/test/java/lang/management/TestThreadInfo.java +++ b/test/functional/JLM_Tests/src_90/org/openj9/test/java/lang/management/TestThreadInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/JLM_Tests/testng.xml b/test/functional/JLM_Tests/testng.xml index 874947b59ff..c1ca8b1451f 100644 --- a/test/functional/JLM_Tests/testng.xml +++ b/test/functional/JLM_Tests/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java10andUp/build.xml b/test/functional/Java10andUp/build.xml index a0538338c3f..27235a98ba6 100644 --- a/test/functional/Java10andUp/build.xml +++ b/test/functional/Java10andUp/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java10andUp/playlist.xml b/test/functional/Java10andUp/playlist.xml index 0d8e0d5ef4e..9793e6f55d2 100644 --- a/test/functional/Java10andUp/playlist.xml +++ b/test/functional/Java10andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITestJava10.java b/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITestJava10.java index 928e17f6b8e..bd82ccee018 100644 --- a/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITestJava10.java +++ b/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITestJava10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java b/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java index b6d6b6a2b0a..aeae1e21b90 100644 --- a/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java +++ b/test/functional/Java10andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java10andUp/src/org/openj9/test/stackWalker/StackWalkerTestJava10.java b/test/functional/Java10andUp/src/org/openj9/test/stackWalker/StackWalkerTestJava10.java index c8c07ed0773..3fa5fe3c498 100644 --- a/test/functional/Java10andUp/src/org/openj9/test/stackWalker/StackWalkerTestJava10.java +++ b/test/functional/Java10andUp/src/org/openj9/test/stackWalker/StackWalkerTestJava10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.stackWalker; diff --git a/test/functional/Java10andUp/testng.xml b/test/functional/Java10andUp/testng.xml index a69bdc7050e..1f2d021153b 100644 --- a/test/functional/Java10andUp/testng.xml +++ b/test/functional/Java10andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java11andUp/build.xml b/test/functional/Java11andUp/build.xml index 57cdf857e5f..245c9438258 100644 --- a/test/functional/Java11andUp/build.xml +++ b/test/functional/Java11andUp/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java11andUp/playlist.xml b/test/functional/Java11andUp/playlist.xml index 3dc6133f6cb..1170638fbdd 100644 --- a/test/functional/Java11andUp/playlist.xml +++ b/test/functional/Java11andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/BootstrapMethods.java b/test/functional/Java11andUp/src/org/openj9/test/condy/BootstrapMethods.java index 6de5f7aa69f..74c3be5edd3 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/condy/BootstrapMethods.java +++ b/test/functional/Java11andUp/src/org/openj9/test/condy/BootstrapMethods.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.condy; diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/CondyClassLoader.java b/test/functional/Java11andUp/src/org/openj9/test/condy/CondyClassLoader.java index e00fda048c4..8f49f29b2b0 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/condy/CondyClassLoader.java +++ b/test/functional/Java11andUp/src/org/openj9/test/condy/CondyClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.condy; diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/CondyGenerator.java b/test/functional/Java11andUp/src/org/openj9/test/condy/CondyGenerator.java index fe683bcd169..b7e89a85ee0 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/condy/CondyGenerator.java +++ b/test/functional/Java11andUp/src/org/openj9/test/condy/CondyGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.condy; diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/DefineCondyClass.java b/test/functional/Java11andUp/src/org/openj9/test/condy/DefineCondyClass.java index 70f1adb8b89..104df5434cc 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/condy/DefineCondyClass.java +++ b/test/functional/Java11andUp/src/org/openj9/test/condy/DefineCondyClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.condy; diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/GarbageCollectionCondyTest.java b/test/functional/Java11andUp/src/org/openj9/test/condy/GarbageCollectionCondyTest.java index a83fdd8ce5c..67237ebfabc 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/condy/GarbageCollectionCondyTest.java +++ b/test/functional/Java11andUp/src/org/openj9/test/condy/GarbageCollectionCondyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.condy; diff --git a/test/functional/Java11andUp/src/org/openj9/test/condy/PrimitiveCondyTest.java b/test/functional/Java11andUp/src/org/openj9/test/condy/PrimitiveCondyTest.java index 657d3159e6d..89f87ffafe3 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/condy/PrimitiveCondyTest.java +++ b/test/functional/Java11andUp/src/org/openj9/test/condy/PrimitiveCondyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.condy; diff --git a/test/functional/Java11andUp/src/org/openj9/test/crc32c/TestJavaUtilZipCRC32C.java b/test/functional/Java11andUp/src/org/openj9/test/crc32c/TestJavaUtilZipCRC32C.java index e37364b730c..2b91fd253ea 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/crc32c/TestJavaUtilZipCRC32C.java +++ b/test/functional/Java11andUp/src/org/openj9/test/crc32c/TestJavaUtilZipCRC32C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.crc32c; diff --git a/test/functional/Java11andUp/src/org/openj9/test/java_lang/Test_String.java b/test/functional/Java11andUp/src/org/openj9/test/java_lang/Test_String.java index 3f782dc27af..ca470bb0974 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/java_lang/Test_String.java +++ b/test/functional/Java11andUp/src/org/openj9/test/java_lang/Test_String.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang; diff --git a/test/functional/Java11andUp/src/org/openj9/test/nestmates/ClassGenerator.java b/test/functional/Java11andUp/src/org/openj9/test/nestmates/ClassGenerator.java index efe4f3c7e2b..22e07688dd9 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/nestmates/ClassGenerator.java +++ b/test/functional/Java11andUp/src/org/openj9/test/nestmates/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nestmates; diff --git a/test/functional/Java11andUp/src/org/openj9/test/nestmates/CustomClassLoader.java b/test/functional/Java11andUp/src/org/openj9/test/nestmates/CustomClassLoader.java index 263b02652f3..69b455e3968 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/nestmates/CustomClassLoader.java +++ b/test/functional/Java11andUp/src/org/openj9/test/nestmates/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nestmates; diff --git a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestAttributeTest.java b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestAttributeTest.java index 219e47168e4..e12c01d0ef2 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestAttributeTest.java +++ b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestAttributeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nestmates; diff --git a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestHostAttribute.java b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestHostAttribute.java index 08538fa9298..84aebc6d8ea 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestHostAttribute.java +++ b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestHostAttribute.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nestmates; diff --git a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestMembersAttribute.java b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestMembersAttribute.java index c2d92dc8d02..301ab64bb21 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestMembersAttribute.java +++ b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestMembersAttribute.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nestmates; diff --git a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestmatesTest.java b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestmatesTest.java index 4bade1f4076..c1c5782c5af 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestmatesTest.java +++ b/test/functional/Java11andUp/src/org/openj9/test/nestmates/NestmatesTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nestmates; diff --git a/test/functional/Java11andUp/src/org/openj9/test/varhandle/TestVarHandleInfo.java b/test/functional/Java11andUp/src/org/openj9/test/varhandle/TestVarHandleInfo.java index dcc37ff2d64..220d225aaff 100644 --- a/test/functional/Java11andUp/src/org/openj9/test/varhandle/TestVarHandleInfo.java +++ b/test/functional/Java11andUp/src/org/openj9/test/varhandle/TestVarHandleInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java11andUp/testng.xml b/test/functional/Java11andUp/testng.xml index b7c044a3b35..0aed62c1cd0 100644 --- a/test/functional/Java11andUp/testng.xml +++ b/test/functional/Java11andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java12andUp/build.xml b/test/functional/Java12andUp/build.xml index 8931ade7cfa..a5ce6b5c20f 100644 --- a/test/functional/Java12andUp/build.xml +++ b/test/functional/Java12andUp/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java12andUp/playlist.xml b/test/functional/Java12andUp/playlist.xml index ea0c5cf88e6..b4432ec016a 100644 --- a/test/functional/Java12andUp/playlist.xml +++ b/test/functional/Java12andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_Class.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_Class.java index 4cc59718695..6d2182b745c 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_Class.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_Class.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_String.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_String.java index 284a026ef02..5beffb3a920 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_String.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_String.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_StringIndent.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_StringIndent.java index fd82f2d2978..141c0a2ec82 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_StringIndent.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang/Test_StringIndent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicCallSiteDesc.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicCallSiteDesc.java index 36eb8223adb..b6754c3b869 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicCallSiteDesc.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicCallSiteDesc.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_constant; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicConstantDesc.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicConstantDesc.java index 11a0f1b5974..23694cfa11d 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicConstantDesc.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_constant/Test_DynamicConstantDesc.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_constant; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodHandle.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodHandle.java index a9a0a960880..5236718308f 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodHandle.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodHandle.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_invoke; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodType.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodType.java index 3417ea5d20d..8eadfa3f830 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodType.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_MethodType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_invoke; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandle.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandle.java index e817477d21c..36a66192e6a 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandle.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandle.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_invoke; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandleDesc.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandleDesc.java index 435e2235b94..e649a26980c 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandleDesc.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/Test_VarHandleDesc.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_invoke; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelper.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelper.java index 1e920d31521..703d3c40906 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelper.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_invoke.helpers; diff --git a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelperImpl.java b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelperImpl.java index 428d72aa6ea..198446a1649 100644 --- a/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelperImpl.java +++ b/test/functional/Java12andUp/src/org/openj9/test/java_lang_invoke/helpers/Jep334MHHelperImpl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java_lang_invoke.helpers; diff --git a/test/functional/Java12andUp/testng.xml b/test/functional/Java12andUp/testng.xml index 443cdf82784..c67500dcf76 100644 --- a/test/functional/Java12andUp/testng.xml +++ b/test/functional/Java12andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java14andUp/build.xml b/test/functional/Java14andUp/build.xml index f4728a029bf..c50c2d465ec 100644 --- a/test/functional/Java14andUp/build.xml +++ b/test/functional/Java14andUp/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java14andUp/playlist.xml b/test/functional/Java14andUp/playlist.xml index 3c673de6778..37359490fc0 100644 --- a/test/functional/Java14andUp/playlist.xml +++ b/test/functional/Java14andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Class.java index 8167be0739e..6f4d8a61311 100644 --- a/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Class.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Thread.java b/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Thread.java index 2ecc5de9044..a64e9d78c97 100644 --- a/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Thread.java +++ b/test/functional/Java14andUp/src/org/openj9/test/java/lang/Test_Thread.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java14andUp/src/org/openj9/test/jep358/NPEMessageTests.java b/test/functional/Java14andUp/src/org/openj9/test/jep358/NPEMessageTests.java index 63d66232bd0..a9a841336d6 100644 --- a/test/functional/Java14andUp/src/org/openj9/test/jep358/NPEMessageTests.java +++ b/test/functional/Java14andUp/src/org/openj9/test/jep358/NPEMessageTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java14andUp/src/org/openj9/test/records/RecordClassTests.java b/test/functional/Java14andUp/src/org/openj9/test/records/RecordClassTests.java index 79e0e24a099..306ff107543 100644 --- a/test/functional/Java14andUp/src/org/openj9/test/records/RecordClassTests.java +++ b/test/functional/Java14andUp/src/org/openj9/test/records/RecordClassTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java14andUp/src/org/openj9/test/utilities/CustomClassLoader.java b/test/functional/Java14andUp/src/org/openj9/test/utilities/CustomClassLoader.java index fb876d55fba..5a45a8e0151 100644 --- a/test/functional/Java14andUp/src/org/openj9/test/utilities/CustomClassLoader.java +++ b/test/functional/Java14andUp/src/org/openj9/test/utilities/CustomClassLoader.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class CustomClassLoader extends ClassLoader { diff --git a/test/functional/Java14andUp/src/org/openj9/test/utilities/RecordClassGenerator.java b/test/functional/Java14andUp/src/org/openj9/test/utilities/RecordClassGenerator.java index 0a33ac07ea5..9c371106858 100644 --- a/test/functional/Java14andUp/src/org/openj9/test/utilities/RecordClassGenerator.java +++ b/test/functional/Java14andUp/src/org/openj9/test/utilities/RecordClassGenerator.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.objectweb.asm.*; diff --git a/test/functional/Java14andUp/testng.xml b/test/functional/Java14andUp/testng.xml index ebcc6d4673e..4e7dc8340f3 100644 --- a/test/functional/Java14andUp/testng.xml +++ b/test/functional/Java14andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java15andUp/build.xml b/test/functional/Java15andUp/build.xml index c136d8c50bb..5bc80b8bef2 100644 --- a/test/functional/Java15andUp/build.xml +++ b/test/functional/Java15andUp/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java15andUp/playlist.xml b/test/functional/Java15andUp/playlist.xml index 99efd9485c6..230a8ccdb9f 100644 --- a/test/functional/Java15andUp/playlist.xml +++ b/test/functional/Java15andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java15andUp/src/org/openj9/test/hiddenclasses/HiddenClassFinalFieldTests.java b/test/functional/Java15andUp/src/org/openj9/test/hiddenclasses/HiddenClassFinalFieldTests.java index 549523a7aa0..ac5a4c7de06 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/hiddenclasses/HiddenClassFinalFieldTests.java +++ b/test/functional/Java15andUp/src/org/openj9/test/hiddenclasses/HiddenClassFinalFieldTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import jdk.internal.misc.Unsafe; diff --git a/test/functional/Java15andUp/src/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java15andUp/src/org/openj9/test/java/lang/Test_Class.java index 113149b230e..ac9e0d12554 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java15andUp/src/org/openj9/test/java/lang/Test_Class.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java15andUp/src/org/openj9/test/java/lang/instrument/Test_Instrumentation.java b/test/functional/Java15andUp/src/org/openj9/test/java/lang/instrument/Test_Instrumentation.java index ff04905ff7b..19b7ffe6019 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/java/lang/instrument/Test_Instrumentation.java +++ b/test/functional/Java15andUp/src/org/openj9/test/java/lang/instrument/Test_Instrumentation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java15andUp/src/org/openj9/test/records/RecordFinalFieldTests.java b/test/functional/Java15andUp/src/org/openj9/test/records/RecordFinalFieldTests.java index 213b47ecdac..b58c72fd5a2 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/records/RecordFinalFieldTests.java +++ b/test/functional/Java15andUp/src/org/openj9/test/records/RecordFinalFieldTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java15andUp/src/org/openj9/test/regularclassesandinterfaces/RegularClassAndInterfaceFinalFieldTests.java b/test/functional/Java15andUp/src/org/openj9/test/regularclassesandinterfaces/RegularClassAndInterfaceFinalFieldTests.java index f3aa259e1de..74bd64c2f12 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/regularclassesandinterfaces/RegularClassAndInterfaceFinalFieldTests.java +++ b/test/functional/Java15andUp/src/org/openj9/test/regularclassesandinterfaces/RegularClassAndInterfaceFinalFieldTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import jdk.internal.misc.Unsafe; diff --git a/test/functional/Java15andUp/src/org/openj9/test/sealedclasses/SealedClassesTests.java b/test/functional/Java15andUp/src/org/openj9/test/sealedclasses/SealedClassesTests.java index 48e9fa6560e..0fed1bd89d3 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/sealedclasses/SealedClassesTests.java +++ b/test/functional/Java15andUp/src/org/openj9/test/sealedclasses/SealedClassesTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java15andUp/src/org/openj9/test/utilities/CustomClassLoader.java b/test/functional/Java15andUp/src/org/openj9/test/utilities/CustomClassLoader.java index fb876d55fba..5a45a8e0151 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/utilities/CustomClassLoader.java +++ b/test/functional/Java15andUp/src/org/openj9/test/utilities/CustomClassLoader.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class CustomClassLoader extends ClassLoader { diff --git a/test/functional/Java15andUp/src/org/openj9/test/utilities/JavaAgent.java b/test/functional/Java15andUp/src/org/openj9/test/utilities/JavaAgent.java index 415a4ff9076..53813eb126f 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/utilities/JavaAgent.java +++ b/test/functional/Java15andUp/src/org/openj9/test/utilities/JavaAgent.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.instrument.Instrumentation; diff --git a/test/functional/Java15andUp/src/org/openj9/test/utilities/SealedClassGenerator.java b/test/functional/Java15andUp/src/org/openj9/test/utilities/SealedClassGenerator.java index c5ad40d27e2..684cd0db585 100644 --- a/test/functional/Java15andUp/src/org/openj9/test/utilities/SealedClassGenerator.java +++ b/test/functional/Java15andUp/src/org/openj9/test/utilities/SealedClassGenerator.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.objectweb.asm.*; diff --git a/test/functional/Java15andUp/testng.xml b/test/functional/Java15andUp/testng.xml index a9edb028dc2..3b1f1b4d8f0 100644 --- a/test/functional/Java15andUp/testng.xml +++ b/test/functional/Java15andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/build.xml b/test/functional/Java16andUp/build.xml index 21b80640be9..8fbe448cab9 100644 --- a/test/functional/Java16andUp/build.xml +++ b/test/functional/Java16andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/module-info.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/module-info.java index e58be3aa089..24bcf7f5451 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/module-info.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.moduleX { diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperClassSealed.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperClassSealed.java index 1f19bf0759d..7b23b384c53 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperClassSealed.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperClassSealed.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.modularity.pkgD.SubClassPermitted1; diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperInterfaceSealed.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperInterfaceSealed.java index ec5603a341a..4f407485483 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperInterfaceSealed.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgA/SuperInterfaceSealed.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.modularity.pkgD.SubClassPermitted2; diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted1.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted1.java index 55d5dc08ed2..bf99b702ce1 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted1.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted1.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.modularity.pkgA.SuperClassSealed; diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted2.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted2.java index 6a8a212101e..6d470cee57e 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted2.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SubClassPermitted2.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.modularity.pkgA.SuperInterfaceSealed; diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SuperClassInSamePkg.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SuperClassInSamePkg.java index 631884a6fe9..692d8b1bb20 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SuperClassInSamePkg.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/SuperClassInSamePkg.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SuperClassInSamePkg {} diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/Test_SubClass.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/Test_SubClass.java index ecaf9718d2f..d7192e9052e 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/Test_SubClass.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleX/org/openj9/test/modularity/pkgD/Test_SubClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/module-info.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/module-info.java index ab8ee935332..16eaefd28e9 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/module-info.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.moduleY { diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/SuperClassFromPkgB.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/SuperClassFromPkgB.java index 1931d426193..0856fa3a243 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/SuperClassFromPkgB.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/SuperClassFromPkgB.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SuperClassFromPkgB {} diff --git a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/Test_SubClass.java b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/Test_SubClass.java index 65c2c048238..761e2263e50 100644 --- a/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/Test_SubClass.java +++ b/test/functional/Java16andUp/modules/org.openj9test.modularity.moduleY/org/openj9/test/modularity/pkgB/Test_SubClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java16andUp/playlist.xml b/test/functional/Java16andUp/playlist.xml index 38002eb0b87..ad8eabd13f2 100644 --- a/test/functional/Java16andUp/playlist.xml +++ b/test/functional/Java16andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/src/org/openj9/test/java/lang/SuperClassInSamePkg.java b/test/functional/Java16andUp/src/org/openj9/test/java/lang/SuperClassInSamePkg.java index f2c167ac5a7..b0ec1ae4847 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/java/lang/SuperClassInSamePkg.java +++ b/test/functional/Java16andUp/src/org/openj9/test/java/lang/SuperClassInSamePkg.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SuperClassInSamePkg {} diff --git a/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_Class.java index 282effeeb46..b550557abd6 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_Class.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_SubClass.java b/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_SubClass.java index 097516ecea6..84038831222 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_SubClass.java +++ b/test/functional/Java16andUp/src/org/openj9/test/java/lang/Test_SubClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperClassSealed.java b/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperClassSealed.java index da53a26891c..e5e2a24a2a9 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperClassSealed.java +++ b/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperClassSealed.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public sealed class SuperClassSealed permits TestSubclass1 { diff --git a/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperInterfaceSealed.java b/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperInterfaceSealed.java index 8657f7920f2..cbc974d2bcb 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperInterfaceSealed.java +++ b/test/functional/Java16andUp/src/org/openj9/test/java/pkgC/SuperInterfaceSealed.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public sealed interface SuperInterfaceSealed permits TestSubclass3 { diff --git a/test/functional/Java16andUp/src/org/openj9/test/utilities/CustomClassLoader.java b/test/functional/Java16andUp/src/org/openj9/test/utilities/CustomClassLoader.java index 2796beca597..8a45e6afdb2 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/utilities/CustomClassLoader.java +++ b/test/functional/Java16andUp/src/org/openj9/test/utilities/CustomClassLoader.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class CustomClassLoader extends ClassLoader { diff --git a/test/functional/Java16andUp/src/org/openj9/test/utilities/SealedClassGenerator.java b/test/functional/Java16andUp/src/org/openj9/test/utilities/SealedClassGenerator.java index 20b182690dc..376f9b03df9 100644 --- a/test/functional/Java16andUp/src/org/openj9/test/utilities/SealedClassGenerator.java +++ b/test/functional/Java16andUp/src/org/openj9/test/utilities/SealedClassGenerator.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.objectweb.asm.*; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java b/test/functional/Java16andUp/src_160/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java index 7a488f8c4fe..f4ca0f2a940 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.Assert; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/InvalidDownCallTests.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/InvalidDownCallTests.java index d41c570d09c..198a4bd48f0 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/InvalidDownCallTests.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/InvalidDownCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiCallTests.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiCallTests.java index 57e62a72c33..b74028dd984 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiCallTests.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests1.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests1.java index c4b3685d302..b0b15691620 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests1.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests2.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests2.java index 31b8def3890..7f97afe5b92 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests2.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests3.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests3.java index 1f296227395..13c8b366b8c 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests3.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests4.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests4.java index 664e5bf24c1..69ef2c1f7fc 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests4.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/MultiThreadingTests4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/PrimitiveTypeTests.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/PrimitiveTypeTests.java index c4811f67754..3e5573fea0b 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/PrimitiveTypeTests.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/PrimitiveTypeTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/StructTests.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/StructTests.java index 42b3352e298..206f6b6c4e1 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/StructTests.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/downcall/StructTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/valist/VaListTests.java b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/valist/VaListTests.java index 8253a383a52..23f9643920f 100644 --- a/test/functional/Java16andUp/src_160/org/openj9/test/jep389/valist/VaListTests.java +++ b/test/functional/Java16andUp/src_160/org/openj9/test/jep389/valist/VaListTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.valist; diff --git a/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentModule.xml b/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentModule.xml index 445dccc43be..3df4c377e83 100644 --- a/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentModule.xml +++ b/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentModule.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameNamedModule.xml b/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameNamedModule.xml index 05858d9df93..d4272841b6e 100644 --- a/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameNamedModule.xml +++ b/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameNamedModule.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameUnamedModule.xml b/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameUnamedModule.xml index 8a5dfcaf7bd..8f7af6ee221 100644 --- a/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameUnamedModule.xml +++ b/test/functional/Java16andUp/testSubClassOfSealedSuperFromDifferentPackageInSameUnamedModule.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/testng.xml b/test/functional/Java16andUp/testng.xml index ba8ccb61a06..f9c2c14b1b4 100644 --- a/test/functional/Java16andUp/testng.xml +++ b/test/functional/Java16andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java16andUp/testng_160.xml b/test/functional/Java16andUp/testng_160.xml index c7542789da0..8c86d82d5cf 100644 --- a/test/functional/Java16andUp/testng_160.xml +++ b/test/functional/Java16andUp/testng_160.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java17andUp/build.xml b/test/functional/Java17andUp/build.xml index de9f7777bfe..690f254cb88 100644 --- a/test/functional/Java17andUp/build.xml +++ b/test/functional/Java17andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java17andUp/playlist.xml b/test/functional/Java17andUp/playlist.xml index 44478890d69..4641a67ef2b 100644 --- a/test/functional/Java17andUp/playlist.xml +++ b/test/functional/Java17andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java17andUp/src/org/openj9/test/java/lang/DummyClass.java b/test/functional/Java17andUp/src/org/openj9/test/java/lang/DummyClass.java index 988ceedc961..0d22a5f1144 100644 --- a/test/functional/Java17andUp/src/org/openj9/test/java/lang/DummyClass.java +++ b/test/functional/Java17andUp/src/org/openj9/test/java/lang/DummyClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java b/test/functional/Java17andUp/src_170/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java index 7a488f8c4fe..f4ca0f2a940 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.Assert; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/InvalidDownCallTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/InvalidDownCallTests.java index f8047c3c67b..bd7db44f826 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/InvalidDownCallTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/InvalidDownCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiCallTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiCallTests.java index ac017e972d4..5247e879f47 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiCallTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests1.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests1.java index dcfa7ec9daf..c7f31773764 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests1.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests2.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests2.java index cbdf92a4d18..144d0fbb345 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests2.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests3.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests3.java index f0395505507..a2a35591b54 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests3.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests4.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests4.java index dc2e8c669fa..990b7524e8f 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests4.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests5.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests5.java index fa4e5bab0a7..ce5efbe3352 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests5.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/MultiThreadingTests5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests1.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests1.java index 50ee5146fcd..3889a344c4c 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests1.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests2.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests2.java index 6cfde9ca354..b146d92a0b4 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests2.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests3.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests3.java index 87841515d12..9e5a7fda4ae 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests3.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/PrimitiveTypeTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests1.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests1.java index 593622b0a4c..557b253259e 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests1.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests2.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests2.java index f09f3c358aa..0307f72caf6 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests2.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/downcall/StructTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.downcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/InvalidUpCallTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/InvalidUpCallTests.java index 64e5427eae8..8107857aa93 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/InvalidUpCallTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/InvalidUpCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallMHTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallMHTests.java index 103e2f51175..9766db959b3 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallMHTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests1.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests1.java index 3de00a2e82b..d3031b7b16f 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests1.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests2.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests2.java index f3696930501..16855a15dee 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests2.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/MultiUpcallThrdsMHTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithMixedSigStruTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithMixedSigStruTests.java index f10279e93d3..2a63192271f 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithMixedSigStruTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithMixedSigStruTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithPrimTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithPrimTests.java index f728083cb05..a8eefdf8cea 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithPrimTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithPrimTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithStructTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithStructTests.java index b7a1a4fade2..9c70a0db855 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithStructTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMHWithStructTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMethodHandles.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMethodHandles.java index 3edb3d4c9f2..25e28cc34f1 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMethodHandles.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/upcall/UpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.upcall; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/ApiTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/ApiTests.java index 3a043745434..d2212606ae9 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/ApiTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/ApiTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.valist; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/DowncallTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/DowncallTests.java index a07c3d3e0b9..c3c4d5a41ac 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/DowncallTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/DowncallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.valist; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/UpcallTests.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/UpcallTests.java index 6d90e7e6aee..ad4b4e6171f 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/UpcallTests.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/UpcallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.valist; diff --git a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/VaListUpcallMethodHandles.java b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/VaListUpcallMethodHandles.java index cf7c056ce13..ec2dab03656 100644 --- a/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/VaListUpcallMethodHandles.java +++ b/test/functional/Java17andUp/src_170/org/openj9/test/jep389/valist/VaListUpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep389.valist; diff --git a/test/functional/Java17andUp/testng_170.xml b/test/functional/Java17andUp/testng_170.xml index 16a984eca6f..ebe472e28cd 100644 --- a/test/functional/Java17andUp/testng_170.xml +++ b/test/functional/Java17andUp/testng_170.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java18andUp/build.xml b/test/functional/Java18andUp/build.xml index 20bf6c730a4..dedb6e18ff1 100644 --- a/test/functional/Java18andUp/build.xml +++ b/test/functional/Java18andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java18andUp/playlist.xml b/test/functional/Java18andUp/playlist.xml index 82a7953cf86..5f3251b4b8c 100644 --- a/test/functional/Java18andUp/playlist.xml +++ b/test/functional/Java18andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java18andUp/src/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java b/test/functional/Java18andUp/src/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java index 7a488f8c4fe..f4ca0f2a940 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java +++ b/test/functional/Java18andUp/src/org/openj9/test/foreignMemoryAccess/TestCloseScope0.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.Assert; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/InvalidDownCallTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/InvalidDownCallTests.java index e2a1a50b180..b8e96994f6f 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/InvalidDownCallTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/InvalidDownCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiCallTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiCallTests.java index d85aab0bd09..e59d2035bda 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiCallTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests1.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests1.java index 71fd664d0ea..fad2777dc89 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests1.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests2.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests2.java index cae20898691..522a9341b69 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests2.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests3.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests3.java index 03c60a1e369..0559f48ca29 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests3.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests4.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests4.java index c4c7d817362..2bb7dab1197 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests4.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests5.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests5.java index 2a2e980f640..af9ee88abc7 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests5.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/MultiThreadingTests5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests1.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests1.java index 4f33bdc6f3d..19d2489b120 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests1.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests2.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests2.java index a56fdf35c40..e13a1a6f876 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests2.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/PrimitiveTypeTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests1.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests1.java index b9c4b5101e6..467f6fcf5ee 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests1.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests2.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests2.java index 157a4a797eb..17ebf98674d 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests2.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/downcall/StructTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.downcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallMHTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallMHTests.java index 585b1e17d80..13180ce43fc 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallMHTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests1.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests1.java index fee49f1000e..df2eaf7dd5a 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests1.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests2.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests2.java index 0f8fa455319..28d42c85b2b 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests2.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/MultiUpcallThrdsMHTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithMixedSigStruTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithMixedSigStruTests.java index 490ea3a10f9..87cfdd78987 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithMixedSigStruTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithMixedSigStruTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithPrimTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithPrimTests.java index b14c238b0d3..a1139cb356e 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithPrimTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithPrimTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithStructTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithStructTests.java index 2d9328a50fb..4e0a9f8ce4f 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithStructTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMHWithStructTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMethodHandles.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMethodHandles.java index ef8f35c533e..324cd15add3 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMethodHandles.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/upcall/UpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.upcall; diff --git a/test/functional/Java18andUp/src/org/openj9/test/jep419/valist/ApiTests.java b/test/functional/Java18andUp/src/org/openj9/test/jep419/valist/ApiTests.java index 75a657c0b5b..f73acaa9cb9 100644 --- a/test/functional/Java18andUp/src/org/openj9/test/jep419/valist/ApiTests.java +++ b/test/functional/Java18andUp/src/org/openj9/test/jep419/valist/ApiTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep419.valist; diff --git a/test/functional/Java18andUp/testng_180.xml b/test/functional/Java18andUp/testng_180.xml index 0f081972015..5c4a2a09efb 100644 --- a/test/functional/Java18andUp/testng_180.xml +++ b/test/functional/Java18andUp/testng_180.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java19andUp/build.xml b/test/functional/Java19andUp/build.xml index 5713178a9fd..578f3812c58 100644 --- a/test/functional/Java19andUp/build.xml +++ b/test/functional/Java19andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java19andUp/playlist.xml b/test/functional/Java19andUp/playlist.xml index ca859d40a77..e7f082eb051 100644 --- a/test/functional/Java19andUp/playlist.xml +++ b/test/functional/Java19andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/InvalidDownCallTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/InvalidDownCallTests.java index c42ae30f035..e1d81274bb2 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/InvalidDownCallTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/InvalidDownCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiCallTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiCallTests.java index 4d43375598b..437c0b89c6d 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiCallTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests1.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests1.java index 97a7a54a2da..ba28f0ece31 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests1.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests2.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests2.java index 2e0374c2a0f..c29f44bc6a4 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests2.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests3.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests3.java index 688445e40bc..5d9219a1e10 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests3.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests4.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests4.java index d06cbc8406f..f10d77b5777 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests4.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests5.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests5.java index 1f34d67411d..c2daba8b257 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests5.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/MultiThreadingTests5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests1.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests1.java index 1ecef0807a2..9e96aa8fd40 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests1.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests2.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests2.java index a78f6f3ab82..bfdaded261f 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests2.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/PrimitiveTypeTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests1.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests1.java index 0f64ee9fade..8e71d68bbf9 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests1.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests2.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests2.java index fd214d814b5..d494cb7ac5b 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests2.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/downcall/StructTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.downcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/InvalidUpCallTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/InvalidUpCallTests.java index 54dc142f61d..863097d11c0 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/InvalidUpCallTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/InvalidUpCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallMHTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallMHTests.java index c99e84e060f..22d343b93e2 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallMHTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests1.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests1.java index 7d30d0083dd..50687ae96d2 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests1.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests2.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests2.java index 25b123c3ab0..64ec4938984 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests2.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/MultiUpcallThrdsMHTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithMixedSigStruTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithMixedSigStruTests.java index 3641f485813..ba185e21c08 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithMixedSigStruTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithMixedSigStruTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithPrimTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithPrimTests.java index e6f7a61bf3b..30a566576e7 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithPrimTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithPrimTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithStructTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithStructTests.java index 69d8efdd95f..b4fd6efdc9a 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithStructTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMHWithStructTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMethodHandles.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMethodHandles.java index 48ab8cec22c..ba16ce5f9d2 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMethodHandles.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/upcall/UpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.upcall; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/ApiTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/ApiTests.java index e37043f87cb..97f995031fa 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/ApiTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/ApiTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.valist; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/DowncallTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/DowncallTests.java index 9ac8fd33f16..551bd8ffaad 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/DowncallTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/DowncallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.valist; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/UpcallTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/UpcallTests.java index 2bbccd576c4..c4cf9819c10 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/UpcallTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/UpcallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.valist; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/VaListUpcallMethodHandles.java b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/VaListUpcallMethodHandles.java index 923355e5154..e3456e1d9d0 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/VaListUpcallMethodHandles.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep424/valist/VaListUpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep424.valist; diff --git a/test/functional/Java19andUp/src/org/openj9/test/jep425/VirtualThreadTests.java b/test/functional/Java19andUp/src/org/openj9/test/jep425/VirtualThreadTests.java index 48d5da58195..409fdd5b422 100644 --- a/test/functional/Java19andUp/src/org/openj9/test/jep425/VirtualThreadTests.java +++ b/test/functional/Java19andUp/src/org/openj9/test/jep425/VirtualThreadTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep425; diff --git a/test/functional/Java19andUp/testng_190.xml b/test/functional/Java19andUp/testng_190.xml index 36aeb99298e..d877c20ebcf 100644 --- a/test/functional/Java19andUp/testng_190.xml +++ b/test/functional/Java19andUp/testng_190.xml @@ -19,7 +19,7 @@ Copyright IBM Corp. and others 2022 [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java20andUp/build.xml b/test/functional/Java20andUp/build.xml index 8fcdc630c4d..72eca45d400 100644 --- a/test/functional/Java20andUp/build.xml +++ b/test/functional/Java20andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java20andUp/playlist.xml b/test/functional/Java20andUp/playlist.xml index cfb707c85ca..a2e1f958203 100644 --- a/test/functional/Java20andUp/playlist.xml +++ b/test/functional/Java20andUp/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep425/VirtualThreadTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep425/VirtualThreadTests.java index 7488fd31248..521bb0f70fe 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep425/VirtualThreadTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep425/VirtualThreadTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep425; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/InvalidDownCallTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/InvalidDownCallTests.java index f9fb76e816e..c8b62ad8925 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/InvalidDownCallTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/InvalidDownCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiCallTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiCallTests.java index f7c87bbe9cb..7438c3f2c35 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiCallTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests1.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests1.java index 386453866c6..8cb29b7aada 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests1.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests2.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests2.java index 6f1c6fc9844..e8eb4027f6c 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests2.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests3.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests3.java index e9547312f80..85de2045891 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests3.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests4.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests4.java index 615a4786b93..7aea53a8a85 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests4.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests5.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests5.java index 270bb797a52..1276a66167f 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests5.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/MultiThreadingTests5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests1.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests1.java index a4a76892208..0744d3a2a8b 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests1.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests2.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests2.java index dc5523b52e0..2a076cfb788 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests2.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/PrimitiveTypeTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests1.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests1.java index 0e809807da8..d9990e5a852 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests1.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests2.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests2.java index 5746ebc3a19..d37497223e3 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests2.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/downcall/StructTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.downcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/InvalidUpCallTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/InvalidUpCallTests.java index 567c430e547..ecad1bf39f9 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/InvalidUpCallTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/InvalidUpCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallMHTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallMHTests.java index 88e8db58c28..02ecc79fad3 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallMHTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests1.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests1.java index 45e160091af..398f0f59d1e 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests1.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests2.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests2.java index 042e82d15a9..a13c7ea35f1 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests2.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/MultiUpcallThrdsMHTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithMixedSigStruTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithMixedSigStruTests.java index 070bc2c6cce..c0f56ab27c4 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithMixedSigStruTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithMixedSigStruTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithPrimTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithPrimTests.java index 5df8475178e..c2f56786cd7 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithPrimTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithPrimTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithStructTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithStructTests.java index 579c589ac9f..f1800264bc9 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithStructTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMHWithStructTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMethodHandles.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMethodHandles.java index 18a96f0f9a6..d351791f796 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMethodHandles.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/upcall/UpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.upcall; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/ApiTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/ApiTests.java index 47f426f8a8b..8f0b06e8dff 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/ApiTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/ApiTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.valist; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/DowncallTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/DowncallTests.java index f12ae98a39f..edd722bcd08 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/DowncallTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/DowncallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.valist; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/UpcallTests.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/UpcallTests.java index bbdb19fb5a2..cf4c891514f 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/UpcallTests.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/UpcallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.valist; diff --git a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/VaListUpcallMethodHandles.java b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/VaListUpcallMethodHandles.java index d867123022e..133edb4847e 100644 --- a/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/VaListUpcallMethodHandles.java +++ b/test/functional/Java20andUp/src/org/openj9/test/jep434/valist/VaListUpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep434.valist; diff --git a/test/functional/Java20andUp/testng_200.xml b/test/functional/Java20andUp/testng_200.xml index dfbbd254294..8d1b04a07ce 100644 --- a/test/functional/Java20andUp/testng_200.xml +++ b/test/functional/Java20andUp/testng_200.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java21andUp/build.xml b/test/functional/Java21andUp/build.xml index a2f493ed746..2d7ad9099ef 100644 --- a/test/functional/Java21andUp/build.xml +++ b/test/functional/Java21andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java21andUp/playlist.xml b/test/functional/Java21andUp/playlist.xml index 64fb677a43f..b135983f60a 100644 --- a/test/functional/Java21andUp/playlist.xml +++ b/test/functional/Java21andUp/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep425/VirtualThreadTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep425/VirtualThreadTests.java index 7488fd31248..521bb0f70fe 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep425/VirtualThreadTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep425/VirtualThreadTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep425; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/InvalidDownCallTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/InvalidDownCallTests.java index ab8df6e7344..991cb81782d 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/InvalidDownCallTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/InvalidDownCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiCallTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiCallTests.java index d2adf492971..8a150981d44 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiCallTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests1.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests1.java index e044ed6271d..5f18f6e3918 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests1.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests2.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests2.java index 4990c924e92..cd2f7e15211 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests2.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests3.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests3.java index 6d4539d6b3b..73c714b83ac 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests3.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests4.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests4.java index 92fef739b7c..a48e68f3837 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests4.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests5.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests5.java index fc24993f775..340d4033f1e 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests5.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/MultiThreadingTests5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests1.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests1.java index 25f420cb86c..f63dde00850 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests1.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests2.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests2.java index f0c8a042876..a5b9c15987d 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests2.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/PrimitiveTypeTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests1.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests1.java index 9b023d29f19..3cfe26cea1f 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests1.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests2.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests2.java index db27e4c03e3..05d18590708 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests2.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/downcall/StructTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.downcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/InvalidUpCallTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/InvalidUpCallTests.java index 090a76ba1d3..768773dac36 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/InvalidUpCallTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/InvalidUpCallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallMHTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallMHTests.java index 28e09a5bf3d..7c49e61ea24 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallMHTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests1.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests1.java index 3fbd61d9bb1..ff8dac22837 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests1.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests2.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests2.java index 7bbb15074b1..cc11ea9b669 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests2.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/MultiUpcallThrdsMHTests2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithMixedSigStruTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithMixedSigStruTests.java index 5d4e02132e9..05fcec7ef39 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithMixedSigStruTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithMixedSigStruTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithPrimTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithPrimTests.java index d1fe5792418..f7b1e999b38 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithPrimTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithPrimTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithStructTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithStructTests.java index f46d0b38124..ab34d11e2b6 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithStructTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMHWithStructTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMethodHandles.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMethodHandles.java index 3dccc71b2cc..64ef4d829e9 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMethodHandles.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/upcall/UpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.upcall; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/ApiTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/ApiTests.java index 32d69ac41e3..e019aa4a833 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/ApiTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/ApiTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.valist; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/DowncallTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/DowncallTests.java index 06399e05c08..e136f60af45 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/DowncallTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/DowncallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.valist; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/UpcallTests.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/UpcallTests.java index e8c70952270..c81e7446864 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/UpcallTests.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/UpcallTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.valist; diff --git a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/VaListUpcallMethodHandles.java b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/VaListUpcallMethodHandles.java index 6dc2034ffb4..4167308919e 100644 --- a/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/VaListUpcallMethodHandles.java +++ b/test/functional/Java21andUp/src/org/openj9/test/jep442/valist/VaListUpcallMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jep442.valist; diff --git a/test/functional/Java21andUp/testng_210.xml b/test/functional/Java21andUp/testng_210.xml index 1908a003299..1a904d7c700 100644 --- a/test/functional/Java21andUp/testng_210.xml +++ b/test/functional/Java21andUp/testng_210.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java8andUp/build.xml b/test/functional/Java8andUp/build.xml index 39823c1a2fb..2d1972558ea 100644 --- a/test/functional/Java8andUp/build.xml +++ b/test/functional/Java8andUp/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java8andUp/playlist.xml b/test/functional/Java8andUp/playlist.xml index da5e57771b8..4d0a86ef9b7 100644 --- a/test/functional/Java8andUp/playlist.xml +++ b/test/functional/Java8andUp/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> java8andUpSettings.mk diff --git a/test/functional/Java8andUp/scr_DupClassNameTest/version1/DupClassNameTest.java b/test/functional/Java8andUp/scr_DupClassNameTest/version1/DupClassNameTest.java index 92df12b3367..f2c33d76f1e 100644 --- a/test/functional/Java8andUp/scr_DupClassNameTest/version1/DupClassNameTest.java +++ b/test/functional/Java8andUp/scr_DupClassNameTest/version1/DupClassNameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/test/functional/Java8andUp/scr_DupClassNameTest/version2/DupClassNameTest.java b/test/functional/Java8andUp/scr_DupClassNameTest/version2/DupClassNameTest.java index 2fdd96c264b..13a61d31b1b 100644 --- a/test/functional/Java8andUp/scr_DupClassNameTest/version2/DupClassNameTest.java +++ b/test/functional/Java8andUp/scr_DupClassNameTest/version2/DupClassNameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class DupClassNameTest { public static void getStackTrace() { diff --git a/test/functional/Java8andUp/src/j9vm/test/arrayCopy/ArrayCopyTest.java b/test/functional/Java8andUp/src/j9vm/test/arrayCopy/ArrayCopyTest.java index a5ae6044f8b..b0a8d86dcb0 100644 --- a/test/functional/Java8andUp/src/j9vm/test/arrayCopy/ArrayCopyTest.java +++ b/test/functional/Java8andUp/src/j9vm/test/arrayCopy/ArrayCopyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.arrayCopy; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/AscendingCountObject.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/AscendingCountObject.java index 11511182a94..a118cf5b64b 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/AscendingCountObject.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/AscendingCountObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/BiggerHashedObject.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/BiggerHashedObject.java index b3d1d85b3ad..7d4c9107494 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/BiggerHashedObject.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/BiggerHashedObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/BitStatistics.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/BitStatistics.java index 46a4ad5c21f..910ef22783f 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/BitStatistics.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/BitStatistics.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/EvenBiggerHashedObject.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/EvenBiggerHashedObject.java index 4a3ef52c5f1..bd12f484ecb 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/EvenBiggerHashedObject.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/EvenBiggerHashedObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashCollisionTest.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashCollisionTest.java index 28e887077fb..058f5b25d8d 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashCollisionTest.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashCollisionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashStats.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashStats.java index da33e8c1702..5fce38c8f9f 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashStats.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashStats.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashTest.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashTest.java index d766087d23a..6e20e0f9563 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashTest.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeBenchmark.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeBenchmark.java index e7a3778f1ec..a0fcc0b1e8c 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeBenchmark.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeBenchmark.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeUnitTests.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeUnitTests.java index 273071ec90c..a7286538029 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeUnitTests.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashcodeUnitTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObject.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObject.java index a879d69229c..6116d74c868 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObject.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObjectFactory.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObjectFactory.java index 67e34824733..1faa793d30d 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObjectFactory.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/HashedObjectFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrAddingMaskGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrAddingMaskGenerator.java index f9389ac8bc0..b9c1f5e6ab4 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrAddingMaskGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrAddingMaskGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrMaskGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrMaskGenerator.java index 2249357d48d..6491e715a6e 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrMaskGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/LfsrMaskGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConHashCodeGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConHashCodeGenerator.java index c3c0c1b1db2..912be6d6624 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConHashCodeGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConHashCodeGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConLfsrHashGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConLfsrHashGenerator.java index 8266c59f802..6c293f8fb29 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConLfsrHashGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/LinConLfsrHashGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/RandHashCodeGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/RandHashCodeGenerator.java index 23bfafd3979..83df94d42c9 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/RandHashCodeGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/RandHashCodeGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/ResettingLfsrMaskGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/ResettingLfsrMaskGenerator.java index a313cb4ce26..f4a2b4f59a8 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/ResettingLfsrMaskGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/ResettingLfsrMaskGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/RunHashGen.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/RunHashGen.java index efc02b36306..8279a4c32b3 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/RunHashGen.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/RunHashGen.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/Statistics.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/Statistics.java index 7ebf7a24fc3..1cfd33a09d5 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/Statistics.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/Statistics.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/TestHashConsistency.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/TestHashConsistency.java index 9a351218abc..79bec431f6b 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/TestHashConsistency.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/TestHashConsistency.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/TrlTest.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/TrlTest.java index 1b52f68b0c6..689eab5eb0c 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/TrlTest.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/TrlTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLfsr.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLfsr.java index b83c64c290f..c03abbb5a66 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLfsr.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLfsr.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode.generator; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLinCon.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLinCon.java index 6288bf97d58..a098111c397 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLinCon.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/CheckLinCon.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode.generator; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/DummyGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/DummyGenerator.java index 9faf1c40e93..2053863ba62 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/DummyGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/DummyGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode.generator; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/HashCodeGenerator.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/HashCodeGenerator.java index 6338037b0be..d52b030ed71 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/HashCodeGenerator.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/HashCodeGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode.generator; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/Lfsr.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/Lfsr.java index 6813bc41888..66ee3357be4 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/Lfsr.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/Lfsr.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode.generator; diff --git a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/LinCon.java b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/LinCon.java index 14b6705bf1f..9b3ee40cb16 100644 --- a/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/LinCon.java +++ b/test/functional/Java8andUp/src/j9vm/test/hashCode/generator/LinCon.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.hashCode.generator; diff --git a/test/functional/Java8andUp/src/j9vm/test/invoker/InvokeSpecialInsideInterface.java b/test/functional/Java8andUp/src/j9vm/test/invoker/InvokeSpecialInsideInterface.java index d270dfabd52..fb6e8b90dc4 100644 --- a/test/functional/Java8andUp/src/j9vm/test/invoker/InvokeSpecialInsideInterface.java +++ b/test/functional/Java8andUp/src/j9vm/test/invoker/InvokeSpecialInsideInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.invoker; diff --git a/test/functional/Java8andUp/src/j9vm/test/invoker/NodeClass.jasm b/test/functional/Java8andUp/src/j9vm/test/invoker/NodeClass.jasm index a94acc60466..0eedcd90df1 100644 --- a/test/functional/Java8andUp/src/j9vm/test/invoker/NodeClass.jasm +++ b/test/functional/Java8andUp/src/j9vm/test/invoker/NodeClass.jasm @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ class j9vm/test/invoker/NodeClass implements j9vm/test/invoker/NodeInterface diff --git a/test/functional/Java8andUp/src/j9vm/test/invoker/NodeInterface.jasm b/test/functional/Java8andUp/src/j9vm/test/invoker/NodeInterface.jasm index e122ac66615..c42c7ea240e 100644 --- a/test/functional/Java8andUp/src/j9vm/test/invoker/NodeInterface.jasm +++ b/test/functional/Java8andUp/src/j9vm/test/invoker/NodeInterface.jasm @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ interface j9vm/test/invoker/NodeInterface implements j9vm/test/invoker/Root diff --git a/test/functional/Java8andUp/src/j9vm/test/jni/ExceptionTest.java b/test/functional/Java8andUp/src/j9vm/test/jni/ExceptionTest.java index d52fca1c1dd..2dae7698543 100644 --- a/test/functional/Java8andUp/src/j9vm/test/jni/ExceptionTest.java +++ b/test/functional/Java8andUp/src/j9vm/test/jni/ExceptionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/Java8andUp/src/j9vm/test/jni/PthreadTest.java b/test/functional/Java8andUp/src/j9vm/test/jni/PthreadTest.java index ab1e5ee56da..bf8cd7d1999 100644 --- a/test/functional/Java8andUp/src/j9vm/test/jni/PthreadTest.java +++ b/test/functional/Java8andUp/src/j9vm/test/jni/PthreadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/Java8andUp/src/j9vm/test/jni/Utf8Test.java b/test/functional/Java8andUp/src/j9vm/test/jni/Utf8Test.java index 4a1300ce615..287d1b30006 100644 --- a/test/functional/Java8andUp/src/j9vm/test/jni/Utf8Test.java +++ b/test/functional/Java8andUp/src/j9vm/test/jni/Utf8Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/Java8andUp/src/j9vm/test/libpath/Rtf.java b/test/functional/Java8andUp/src/j9vm/test/libpath/Rtf.java index f493b649642..4e2dfe2fcec 100644 --- a/test/functional/Java8andUp/src/j9vm/test/libpath/Rtf.java +++ b/test/functional/Java8andUp/src/j9vm/test/libpath/Rtf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.libpath; diff --git a/test/functional/Java8andUp/src/j9vm/test/libpath/RtfChild.java b/test/functional/Java8andUp/src/j9vm/test/libpath/RtfChild.java index e2aa97fb77e..3ec7969abcb 100644 --- a/test/functional/Java8andUp/src/j9vm/test/libpath/RtfChild.java +++ b/test/functional/Java8andUp/src/j9vm/test/libpath/RtfChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.libpath; diff --git a/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLegacyLibrary.java b/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLegacyLibrary.java index d4a0def9839..f32d264647b 100644 --- a/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLegacyLibrary.java +++ b/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLegacyLibrary.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.loadLibrary; diff --git a/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLibrary.java b/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLibrary.java index a5f87cabf2f..5ec0a822038 100644 --- a/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLibrary.java +++ b/test/functional/Java8andUp/src/j9vm/test/loadLibrary/TestLoadLibrary.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.loadLibrary; diff --git a/test/functional/Java8andUp/src/j9vm/test/memory/MemoryAllocator.java b/test/functional/Java8andUp/src/j9vm/test/memory/MemoryAllocator.java index c2dd44b77c1..7b4b25f4586 100644 --- a/test/functional/Java8andUp/src/j9vm/test/memory/MemoryAllocator.java +++ b/test/functional/Java8andUp/src/j9vm/test/memory/MemoryAllocator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.memory; diff --git a/test/functional/Java8andUp/src/j9vm/test/monitor/Helpers.java b/test/functional/Java8andUp/src/j9vm/test/monitor/Helpers.java index ffae4c62848..72e6313fdbe 100644 --- a/test/functional/Java8andUp/src/j9vm/test/monitor/Helpers.java +++ b/test/functional/Java8andUp/src/j9vm/test/monitor/Helpers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/MethodsClass.java b/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/MethodsClass.java index ef46f936d32..2cd2a4b4226 100644 --- a/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/MethodsClass.java +++ b/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/MethodsClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.reflect.invoke; diff --git a/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/TestInvoke.java b/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/TestInvoke.java index f432c212839..cb83b445794 100644 --- a/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/TestInvoke.java +++ b/test/functional/Java8andUp/src/j9vm/test/reflect/invoke/TestInvoke.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.reflect.invoke; diff --git a/test/functional/Java8andUp/src/j9vm/test/softmx/ExpandHeapUntilOOM.java b/test/functional/Java8andUp/src/j9vm/test/softmx/ExpandHeapUntilOOM.java index 2067fbd3a42..149839e1b9e 100644 --- a/test/functional/Java8andUp/src/j9vm/test/softmx/ExpandHeapUntilOOM.java +++ b/test/functional/Java8andUp/src/j9vm/test/softmx/ExpandHeapUntilOOM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.softmx; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/A.java b/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/A.java index 177d6646746..82da35cf0e1 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/A.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.annotationPackage; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/B.java b/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/B.java index 205d4243d26..7e3a58451a2 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/B.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.annotationPackage; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/package-info.java b/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/package-info.java index f1fbcff2600..48dce22587b 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/package-info.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/annotationPackage/package-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ @XmlSchema(namespace="http://www.abc.com", elementFormDefault=XmlNsForm.QUALIFIED) package org.openj9.resources.annotationPackage; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/A.java b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/A.java index e7a2bb65f2f..a648f34537d 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/A.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/A.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/B.java b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/B.java index 6d0f1d5da3b..a1a07ce7f31 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/B.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/B.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/C.java b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/C.java index c2d4f450809..83de3b76751 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/C.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/C.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/D.java b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/D.java index 3f6042a907a..f84047a97ab 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/D.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/D.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/E.java b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/E.java index 3e1df3943eb..2cfdc356960 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/E.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/E.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/F.java b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/F.java index 50142a6e136..8b7acb7aadd 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/F.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classinheritance/F.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/classloader/CustomSyncProvider.java b/test/functional/Java8andUp/src/org/openj9/resources/classloader/CustomSyncProvider.java index af372ed4848..017a1ffd990 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/classloader/CustomSyncProvider.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/classloader/CustomSyncProvider.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.classloader; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/README b/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/README index 64d6f0c681d..241cbc0edbe 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/README +++ b/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/README @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* HOW TO BUILD ZIP FILE diff --git a/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithParams.java b/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithParams.java index 75893f77179..ac0a2a75634 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithParams.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithParams.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithoutParams.java b/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithoutParams.java index 69a6a03f788..9c84bb667ec 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithoutParams.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/methodparameters/WithoutParams.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/misc/openj9tr_Foo.c b/test/functional/Java8andUp/src/org/openj9/resources/misc/openj9tr_Foo.c index 48e947873d2..91edfd85a39 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/misc/openj9tr_Foo.c +++ b/test/functional/Java8andUp/src/org/openj9/resources/misc/openj9tr_Foo.c @@ -17,6 +17,6 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* Some random file for it to look at. */ diff --git a/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassGenerated.java b/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassGenerated.java index b66d7e3265c..f9212055211 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassGenerated.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassGenerated.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.packagetest; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassNonGenerated.java b/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassNonGenerated.java index 55fb581429d..d8d50e16e7a 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassNonGenerated.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/packagetest/ClassNonGenerated.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.packagetest; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/reflect/A.java b/test/functional/Java8andUp/src/org/openj9/resources/reflect/A.java index 547b9bfa85b..01a77769966 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/reflect/A.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/reflect/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/reflect/B.java b/test/functional/Java8andUp/src/org/openj9/resources/reflect/B.java index 6c9ed97aba4..148a20e8ac3 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/reflect/B.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/reflect/B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.resources.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTest.java b/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTest.java index b976821c8a3..62045203977 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTest.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SecurityTest { diff --git a/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTestSub.java b/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTestSub.java index fad11b230b4..4e2be4bd116 100644 --- a/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTestSub.java +++ b/test/functional/Java8andUp/src/org/openj9/resources/security/SecurityTestSub.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java index 389235bfda5..cfa076ce13c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.fake b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.fake index 389235bfda5..cfa076ce13c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.fake +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.fake @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.real b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.real index 067501e2213..5b0c50857a0 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.real +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCallee.java.real @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller1.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller1.java index 477118f6774..c93f02f3402 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller1.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller2.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller2.java index 070a1a6f62d..18a88f56b00 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller2.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/AppLoaderCaller2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassGenerator.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassGenerator.java index 4591902c15b..35078d2f800 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassGenerator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassInfo.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassInfo.java index d0a6d562692..c50324cbb77 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassInfo.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/ClassInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/CustomClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/CustomClassLoader.java index 502f83e1ce9..dde5f804e7c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/CustomClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/NoSuchMethodTests.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/NoSuchMethodTests.java index fbf0f6ad6ad..d6c136f6c43 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/NoSuchMethodTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/NoSuchMethodTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/TestInfo.java b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/TestInfo.java index d8b5dc205a7..9e5edd39577 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/TestInfo.java +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/TestInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.NoSuchMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/java/lang/String.java.hide b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/java/lang/String.java.hide index 7dfbe26b717..b01a381b72f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/java/lang/String.java.hide +++ b/test/functional/Java8andUp/src/org/openj9/test/NoSuchMethod/java/lang/String.java.hide @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/VMBench/FibBench.java b/test/functional/Java8andUp/src/org/openj9/test/VMBench/FibBench.java index b55ac4d6ec7..84f19bb0ccc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/VMBench/FibBench.java +++ b/test/functional/Java8andUp/src/org/openj9/test/VMBench/FibBench.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.VMBench; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationNotFoundException.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationNotFoundException.java index d988f370b0a..0e475999aef 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationNotFoundException.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationNotFoundException.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class AnnotationNotFoundException extends Exception { private static final long serialVersionUID = 3258129146209972275L; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationTestClass.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationTestClass.java index ccd90c2c122..3d77aec20fe 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationTestClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/AnnotationTestClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ @ValueAnnotation( value = "ValueAnnotation", diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/ClassAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/ClassAnnotation.java index 7a2871a2343..8dd5cf618d0 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/ClassAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/ClassAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/ConstructorAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/ConstructorAnnotation.java index 7b9a261d2c4..2e0014b5536 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/ConstructorAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/ConstructorAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/EnumClass.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/EnumClass.java index 98edced1b27..d953bf5f1cd 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/EnumClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/EnumClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public enum EnumClass { Value1, Value2, Value3 diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/FieldAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/FieldAnnotation.java index 67f0d438f01..16a5e878187 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/FieldAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/FieldAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/MethodAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/MethodAnnotation.java index c018532a9c0..11690975dde 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/MethodAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/MethodAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/PackageAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/PackageAnnotation.java index 2daa221ff87..f64c784a27a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/PackageAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/PackageAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/ParameterAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/ParameterAnnotation.java index 263e925d7d5..c320ae5a31a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/ParameterAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/ParameterAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/TestAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/TestAnnotation.java index eab21a49574..9a4482bab8f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/TestAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/TestAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/Test_Annotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/Test_Annotation.java index e505fd0e69e..7b69d770ce4 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/Test_Annotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/Test_Annotation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/ValueAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/ValueAnnotation.java index 18c36fa5442..5ff6c018609 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/ValueAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/ValueAnnotation.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/defaults/AnnotationTestClassDefaults.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/defaults/AnnotationTestClassDefaults.java index a5bee69574d..823309a48db 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/defaults/AnnotationTestClassDefaults.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/defaults/AnnotationTestClassDefaults.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.annotation.ClassAnnotation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotation/package-info.java b/test/functional/Java8andUp/src/org/openj9/test/annotation/package-info.java index 3d417dcdcbc..39d5516b66d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotation/package-info.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotation/package-info.java @@ -47,5 +47,5 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation1.java b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation1.java index 1fef48add58..3018021c164 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation1.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation1.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation2.java b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation2.java index 0e086993bf7..337453b3357 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation2.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Annotation2.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/AnnotationClass.java b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/AnnotationClass.java index dc802a6c510..62c4fb989f1 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/AnnotationClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/AnnotationClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.*; import java.lang.reflect.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass1.java b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass1.java index a42149e1634..cad28787b81 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass1.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass1.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class HelperClass1 { diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass2.java b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass2.java index 36472a763d5..41a9c8785ba 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass2.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/HelperClass2.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class HelperClass2 { diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Test_ClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Test_ClassLoader.java index ffa64fe7713..69e9274bd11 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Test_ClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationClassLoader/Test_ClassLoader.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.resources.classloader.CustomSyncProvider; import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysByteTest.java b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysByteTest.java index 57611469bed..e36961b6349 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysByteTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysByteTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysIntTest.java b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysIntTest.java index d70d95e0cc9..80669fe5de8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysIntTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/ArraysIntTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Enum1.java b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Enum1.java index 923fbbf3cdb..08e8b43eddd 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Enum1.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Enum1.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public enum Enum1 { diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Test_Annotations.java b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Test_Annotations.java index 790b3a39ee4..f8c39057428 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Test_Annotations.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationIdentity/Test_Annotations.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; import org.testng.log4testng.Logger; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation.java index 8684956b1e1..60fac1c70dd 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation.java @@ -25,7 +25,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; import java.net.URLClassLoader; diff --git a/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation2.java b/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation2.java index faa0ac73da5..c918da97630 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation2.java +++ b/test/functional/Java8andUp/src/org/openj9/test/annotationPackage/Test_PackageAnnotation2.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; import org.testng.log4testng.Logger; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPISanity.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPISanity.java index e6cf68eb620..9e7a26ea0f2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPISanity.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPISanity.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPIStress.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPIStress.java index 7b532d60e9c..cc8697cf161 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPIStress.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachAPIStress.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachApiTest.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachApiTest.java index 8fd16a567c1..45d68ef54d6 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachApiTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/AttachApiTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/ListVms.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/ListVms.java index d4ba88ac146..c2a568819b9 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/ListVms.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/ListVms.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/MemoryExhauster.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/MemoryExhauster.java index 18914bd19b8..041b26b5c62 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/MemoryExhauster.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/MemoryExhauster.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/Props.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/Props.java index 05d6c848a6d..8ef89e10ccf 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/Props.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/Props.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPI.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPI.java index 3381058ddb1..e84bf6f2394 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPI.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPI.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPIEnabling.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPIEnabling.java index 1b118271941..375eb324f89 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPIEnabling.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachAPIEnabling.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachErrorHandling.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachErrorHandling.java index 504116d13ba..0fd4a6a5ece 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachErrorHandling.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestAttachErrorHandling.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestConstants.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestConstants.java index 9c88e1f500b..a5e2da648de 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestConstants.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestConstants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java index b4c29fd9825..3328124482d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJcmd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java index cfee106a538..714d2b0859d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJmap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java index 7e0795257f6..54d2e95d6e5 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJps.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java index 921757099a4..c14f5595ab1 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstack.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java index 9989cd6445f..80383622d06 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestJstat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgent.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgent.java index bc1fb88d4db..d9fe013f317 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgent.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentLibrary.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentLibrary.java index 959450516f5..a4cbf61b168 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentLibrary.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentLibrary.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentPath.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentPath.java index 0105275dec3..db38a33a49b 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentPath.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestLoadAgentPath.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestManagementAgent.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestManagementAgent.java index dc6e0dd7759..c682691de30 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestManagementAgent.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestManagementAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestSunAttachClasses.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestSunAttachClasses.java index 4d1b05b447d..07b7a57a7ee 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestSunAttachClasses.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestSunAttachClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestUtil.java b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestUtil.java index 45f4641290d..7ff671a5681 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestUtil.java +++ b/test/functional/Java8andUp/src/org/openj9/test/attachAPI/TestUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/ClassGenerator.java b/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/ClassGenerator.java index c31edcae840..0aeb7b19edf 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/ClassGenerator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classRelationshipVerifier; diff --git a/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/CustomClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/CustomClassLoader.java index 9a0064e5d6e..dc02e41ce59 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/CustomClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classRelationshipVerifier; diff --git a/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/TestClassRelationshipVerifier.java b/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/TestClassRelationshipVerifier.java index 85b788e4286..a36755e85f4 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/TestClassRelationshipVerifier.java +++ b/test/functional/Java8andUp/src/org/openj9/test/classRelationshipVerifier/TestClassRelationshipVerifier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classRelationshipVerifier; diff --git a/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpers.java b/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpers.java index 8daaafb9642..3fbf41ffe9c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpers.java +++ b/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpers.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.FileInputStream; diff --git a/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpersImpl.java b/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpersImpl.java index 6ebb498b82d..a44f2d622fc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpersImpl.java +++ b/test/functional/Java8andUp/src/org/openj9/test/com/ibm/jit/Test_JITHelpersImpl.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/test/constantpool/ClassInitTest.java b/test/functional/Java8andUp/src/org/openj9/test/constantpool/ClassInitTest.java index 65d670f9252..53ef862cfba 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/constantpool/ClassInitTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/constantpool/ClassInitTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.Assert; diff --git a/test/functional/Java8andUp/src/org/openj9/test/constructorverify/ClassGenerator.java b/test/functional/Java8andUp/src/org/openj9/test/constructorverify/ClassGenerator.java index 3f6ded9187b..d9fb98bf821 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/constructorverify/ClassGenerator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/constructorverify/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.constructorverify; diff --git a/test/functional/Java8andUp/src/org/openj9/test/constructorverify/TryInCtor.java b/test/functional/Java8andUp/src/org/openj9/test/constructorverify/TryInCtor.java index 4eebf431671..121980320f2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/constructorverify/TryInCtor.java +++ b/test/functional/Java8andUp/src/org/openj9/test/constructorverify/TryInCtor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.constructorverify; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/DelegatingLoader.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/DelegatingLoader.java index 46c03dc0583..0009043c1a7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/DelegatingLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/DelegatingLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/EmptyClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/EmptyClassLoader.java index 8388fcae62a..da1a651b25a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/EmptyClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/EmptyClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/LoadingThread.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/LoadingThread.java index cdafb7febb7..0cf7203cb88 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/LoadingThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/LoadingThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/NonParallelCapableDelegatingLoader.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/NonParallelCapableDelegatingLoader.java index 0d23627d2f4..7cece5d6773 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/NonParallelCapableDelegatingLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/NonParallelCapableDelegatingLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelCapableDelegatingLoader.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelCapableDelegatingLoader.java index a951ebd0bbc..56f7b248842 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelCapableDelegatingLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelCapableDelegatingLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelClassLoadingTests.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelClassLoadingTests.java index 0c5789c80a8..126082b16a2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelClassLoadingTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/ParallelClassLoadingTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/PrerequisiteClass.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/PrerequisiteClass.java index 634d48fe52c..56f41e12a34 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/PrerequisiteClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/PrerequisiteClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading.TestClasses; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/TargetClass.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/TargetClass.java index 2c8c56fe978..ada73fd2ebe 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/TargetClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestClasses/TargetClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading.TestClasses; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestVMClassloaderLocking.java b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestVMClassloaderLocking.java index a0016521f1e..4fc43dc4eb7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestVMClassloaderLocking.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedClassLoading/TestVMClassloaderLocking.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedClassLoading; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ClassFieldResolutionTests.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ClassFieldResolutionTests.java index 543c1548f2e..df60febbbd5 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ClassFieldResolutionTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ClassFieldResolutionTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ContendedFieldsTests.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ContendedFieldsTests.java index ce9dd8b33bc..2117e04a28a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ContendedFieldsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/ContendedFieldsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/Crypto.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/Crypto.java index 9a0ebac4ede..9d95b032083 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/Crypto.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/Crypto.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/FieldUtilities.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/FieldUtilities.java index 3a48c2c3ffd..cdfd4ea21d6 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/FieldUtilities.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/FieldUtilities.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SecurityClass.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SecurityClass.java index 4840ad60951..767132114ee 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SecurityClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SecurityClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperCrypto.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperCrypto.java index fbbbfed0ea6..22abc740c80 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperCrypto.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperCrypto.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperDuperCrypto.java b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperDuperCrypto.java index f67ea476179..dbe190bc948 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperDuperCrypto.java +++ b/test/functional/Java8andUp/src/org/openj9/test/contendedfields/SuperDuperCrypto.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/ClassLoadingDelegationTest.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/ClassLoadingDelegationTest.java index fdcae4adf5a..dded11e7c84 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/ClassLoadingDelegationTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/ClassLoadingDelegationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelCapableClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelCapableClassLoader.java index d19aa60f1b3..8704b0eb6ee 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelCapableClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelCapableClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelIncapableClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelIncapableClassLoader.java index 55ff14c9539..0c11e7c289b 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelIncapableClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/ParallelIncapableClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassA.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassA.java index e1fde7c6b1b..39b6203553a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassB.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassB.java index 16490b98413..4990e98cb37 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassB.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestClassB.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestLoader.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestLoader.java index 167fd15b4c9..4a16cab8a49 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestThread.java b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestThread.java index f27b335bc00..91e498c51ca 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/delegation/TestThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/delegation/TestThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.delegation; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/CustomClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/CustomClassLoader.java index 44e9c6b5477..dc02513530d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/CustomClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fastresolve; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/FastresolveTest.java b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/FastresolveTest.java index d495f9638ee..ac9b99be015 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/FastresolveTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/FastresolveTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fastresolve; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/LargeNumFieldsClass.java b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/LargeNumFieldsClass.java index b72a3963800..d2068cefd0f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/LargeNumFieldsClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/LargeNumFieldsClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fastresolve; public class LargeNumFieldsClass{ diff --git a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/readme.txt b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/readme.txt index 56d3a3c416a..9a71a39ffff 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fastresolve/readme.txt +++ b/test/functional/Java8andUp/src/org/openj9/test/fastresolve/readme.txt @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* Purpose: diff --git a/test/functional/Java8andUp/src/org/openj9/test/fileLock/GenericFileLock.java b/test/functional/Java8andUp/src/org/openj9/test/fileLock/GenericFileLock.java index d90b4ceed4b..c841dcf7382 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fileLock/GenericFileLock.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fileLock/GenericFileLock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fileLock; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fileLock/JavaFileLock.java b/test/functional/Java8andUp/src/org/openj9/test/fileLock/JavaFileLock.java index 6139af7e1e1..2ed5b8646e3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fileLock/JavaFileLock.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fileLock/JavaFileLock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fileLock; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fileLock/Locker.java b/test/functional/Java8andUp/src/org/openj9/test/fileLock/Locker.java index f9dccfa7249..e2cb126a170 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fileLock/Locker.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fileLock/Locker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fileLock; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java b/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java index 13c93eba746..e0850fe9b47 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fileLock/NativeFileLock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fileLock; diff --git a/test/functional/Java8andUp/src/org/openj9/test/fileLock/TestFileLocking.java b/test/functional/Java8andUp/src/org/openj9/test/fileLock/TestFileLocking.java index efaf24abd59..a2430606ed8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/fileLock/TestFileLocking.java +++ b/test/functional/Java8andUp/src/org/openj9/test/fileLock/TestFileLocking.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fileLock; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/D.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/D.java index 6c456bc0b61..e89dec3e6cc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/D.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/D.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/ED.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/ED.java index 436bfed8eea..2c240e1f809 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/ED.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/ED.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/F.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/F.java index 175c9b95b0f..29c230c5b22 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/F.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/F.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TD.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TD.java index 817965c48c0..38a50158e06 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TD.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TD.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TestFactory.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TestFactory.java index 4b129957688..4c78873ed2a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TestFactory.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/TestFactory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleDivBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleDivBehaviour.java index c324c433e5d..639373ae2ff 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleDivBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleDivBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleMinusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleMinusBehaviour.java index 1da92fa6ea4..bd43460218a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleMinusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleMinusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoublePlusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoublePlusBehaviour.java index b6cb030d405..ab473b91a58 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoublePlusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoublePlusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleTimesBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleTimesBehaviour.java index fbcad53e9b5..89549b5e530 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleTimesBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalDoubleTimesBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatDivBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatDivBehaviour.java index 7868c29fdc4..0a29fd716d2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatDivBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatDivBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatMinusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatMinusBehaviour.java index 0f2cda1476d..745046dd92f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatMinusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatMinusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatPlusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatPlusBehaviour.java index f0e82c97764..fb6fa6812a4 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatPlusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatPlusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatTimesBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatTimesBehaviour.java index 1d263e4b467..e4ae454949d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatTimesBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDenormalFloatTimesBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleDivRemBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleDivRemBehaviour.java index 5a4503a06cd..24fd432ce23 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleDivRemBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleDivRemBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleMinusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleMinusBehaviour.java index a70dffd8b6b..ab8f2910d30 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleMinusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleMinusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoublePlusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoublePlusBehaviour.java index 6a63df40f81..b849f15b986 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoublePlusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoublePlusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleTimesBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleTimesBehaviour.java index cc61ffb932e..ad329c34966 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleTimesBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckDoubleTimesBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatDivRemBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatDivRemBehaviour.java index 80b1eb7ae28..5dbec3e765a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatDivRemBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatDivRemBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatMinusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatMinusBehaviour.java index 7074180f180..e38091b399d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatMinusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatMinusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatPlusBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatPlusBehaviour.java index 1e89f6b28a8..c3274d01e67 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatPlusBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatPlusBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatTimesBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatTimesBehaviour.java index 1f80d6260fd..3243d1e4f3e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatTimesBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckFloatTimesBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNDoubleBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNDoubleBehaviour.java index 4489043641c..abd616b6968 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNDoubleBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNDoubleBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNFloatBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNFloatBehaviour.java index a0f048b4aa6..eab11cc6271 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNFloatBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNaNFloatBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateDoubleBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateDoubleBehaviour.java index ab5b13cfa0e..7454c089919 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateDoubleBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateDoubleBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateFloatBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateFloatBehaviour.java index d7d73656dcf..0b13502639d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateFloatBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckNegateFloatBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroDoubleBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroDoubleBehaviour.java index 695b22d5297..d4faaf21b59 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroDoubleBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroDoubleBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroFloatBehaviour.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroFloatBehaviour.java index c909ac49311..3acf406de30 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroFloatBehaviour.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/arithmetic/CheckZeroFloatBehaviour.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.arithmetic; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckDoubleAssumptions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckDoubleAssumptions.java index 6255d28e699..9dcfbc5c27e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckDoubleAssumptions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckDoubleAssumptions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.assumptions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckExponentAssumptions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckExponentAssumptions.java index dcd72e48d61..a8328118fdc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckExponentAssumptions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckExponentAssumptions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.assumptions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckFloatAssumptions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckFloatAssumptions.java index 92f8884d7dd..fae97189eeb 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckFloatAssumptions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckFloatAssumptions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.assumptions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckTrigAssumptions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckTrigAssumptions.java index 3fff86215ef..675709208e7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckTrigAssumptions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/assumptions/CheckTrigAssumptions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.assumptions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromDouble.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromDouble.java index 008b92cf10c..68687452ea6 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromDouble.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromDouble.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.conversions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromFloat.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromFloat.java index 617a0f80a91..5ef2917be88 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromFloat.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsFromFloat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.conversions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToDouble.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToDouble.java index cbaf9e8b3e8..52361687210 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToDouble.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToDouble.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.conversions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToFloat.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToFloat.java index 266def4dc9d..f4edba1a71a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToFloat.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/conversions/CheckConversionsToFloat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.conversions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/Check1ULPMath.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/Check1ULPMath.java index 45eeeb5d482..296414fc283 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/Check1ULPMath.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/Check1ULPMath.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.custom; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckFunctionSymmetry.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckFunctionSymmetry.java index 18d5384daee..0b3348cf661 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckFunctionSymmetry.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckFunctionSymmetry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.custom; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckKnownProblems.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckKnownProblems.java index f1d24e8b3ab..162da183f1a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckKnownProblems.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckKnownProblems.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.custom; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckStrictMath.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckStrictMath.java index e4303b563d0..139b8f6450f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckStrictMath.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/custom/CheckStrictMath.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.custom; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleExponentFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleExponentFunctions.java index dbfede7a56e..0836b0172ef 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleExponentFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleExponentFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMinMaxFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMinMaxFunctions.java index 563773a2276..a4828f118fc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMinMaxFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMinMaxFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMiscFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMiscFunctions.java index 10322bf0768..c1384d899ba 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMiscFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleMiscFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleRoundingFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleRoundingFunctions.java index c1730dd8530..d4ce470c172 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleRoundingFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleRoundingFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleTrigFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleTrigFunctions.java index f7f29a8178f..82f19cf0c6d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleTrigFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckDoubleTrigFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatMinMaxFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatMinMaxFunctions.java index 068d437d71e..6483dfa298a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatMinMaxFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatMinMaxFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatRoundingFunctions.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatRoundingFunctions.java index 0fea9a6473c..3b0c4330da7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatRoundingFunctions.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/functions/CheckFloatRoundingFunctions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.functions; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckDoubleComparisons.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckDoubleComparisons.java index 654989d4daa..726d338079b 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckDoubleComparisons.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckDoubleComparisons.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.relational; diff --git a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckFloatComparisons.java b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckFloatComparisons.java index 58c1523caf1..650510c417e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckFloatComparisons.java +++ b/test/functional/Java8andUp/src/org/openj9/test/floatsanity/relational/CheckFloatComparisons.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.floatsanity.relational; diff --git a/test/functional/Java8andUp/src/org/openj9/test/gpu/SortTest.java b/test/functional/Java8andUp/src/org/openj9/test/gpu/SortTest.java index 8294aa2ba8f..79a9ae34698 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/gpu/SortTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/gpu/SortTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.gpu; diff --git a/test/functional/Java8andUp/src/org/openj9/test/ivj/Disk.java b/test/functional/Java8andUp/src/org/openj9/test/ivj/Disk.java index 89f5f354e0c..0708a030eb6 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/ivj/Disk.java +++ b/test/functional/Java8andUp/src/org/openj9/test/ivj/Disk.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/Java8andUp/src/org/openj9/test/ivj/Hanoi.java b/test/functional/Java8andUp/src/org/openj9/test/ivj/Hanoi.java index eef527813e5..f29b99cd968 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/ivj/Hanoi.java +++ b/test/functional/Java8andUp/src/org/openj9/test/ivj/Hanoi.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/Java8andUp/src/org/openj9/test/ivj/Post.java b/test/functional/Java8andUp/src/org/openj9/test/ivj/Post.java index 34b9d63d083..e0abf694639 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/ivj/Post.java +++ b/test/functional/Java8andUp/src/org/openj9/test/ivj/Post.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/Java8andUp/src/org/openj9/test/ivj/TestHanoi.java b/test/functional/Java8andUp/src/org/openj9/test/ivj/TestHanoi.java index 6310bb1b231..510558b0d06 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/ivj/TestHanoi.java +++ b/test/functional/Java8andUp/src/org/openj9/test/ivj/TestHanoi.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/AnnotationType.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/AnnotationType.java index 0245fe54fea..5858c1b698c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/AnnotationType.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/AnnotationType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/DefaultClass.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/DefaultClass.java index f40c336034a..518c714fb3f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/DefaultClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/DefaultClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericClass.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericClass.java index bdac44cfd83..a9ae7069a97 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericsClass.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericsClass.java index 68a1e38dfe0..dd6155e89f7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericsClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/GenericsClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/InnerClasses.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/InnerClasses.java index d730ae97d76..8ebcf9a1b4d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/InnerClasses.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/InnerClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Interface.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Interface.java index 3d28d7108f7..d9ceb57e285 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Interface.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Interface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicEnum.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicEnum.java index c3a1715c1d2..b70161eed09 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicEnum.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicEnum.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicFinalClass.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicFinalClass.java index ec28d6d590e..ea0eb9815dd 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicFinalClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicFinalClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicStrictFPClass.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicStrictFPClass.java index 1fb18181c79..d002802ffd2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicStrictFPClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/PublicStrictFPClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassCastException.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassCastException.java index 42f62fbbdb9..a7e5c709581 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassCastException.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassCastException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader.java index b0ec87e159a..4296492eada 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_Native.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_Native.java index cbf7f4fab28..e5f8b614543 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_Native.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_Native.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_SM.java index 10fbb54235c..56fcb28edbb 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ClassLoader_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Class_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Class_SM.java index dc97a8bfb5c..3d82e7b4e72 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Class_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Class_SM.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Compiler.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Compiler.java index 5709964e19a..723cd9ed3b1 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Compiler.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Compiler.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationError.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationError.java index 48657b7b9a4..033d21af39a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationError.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationError.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationException.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationException.java index b4301b6370e..e3444cb9b0d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationException.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_InstantiationException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals.java index 64fe3d12b17..9adca8279cf 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl.java index 138fc246f1e..514640cd2fe 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl_SM.java index b3946f853ac..99665f8fc4e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternalsImpl_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals_SM.java index c9ec902815b..7c708b25e7a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_J9VMInternals_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Math.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Math.java index d62a37289e9..83ea527a49b 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Math.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Math.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Object.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Object.java index 7db544a8393..3c943c7b2d4 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Object.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Object.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_OutOfMemoryError.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_OutOfMemoryError.java index 52461d237ef..187b0466862 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_OutOfMemoryError.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_OutOfMemoryError.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_RuntimePermission.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_RuntimePermission.java index e92b1e2651c..18d79c2c9f7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_RuntimePermission.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_RuntimePermission.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_String.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_String.java index 066ff82b299..7bbe41e6fbf 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_String.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_String.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuffer.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuffer.java index 61574584705..cf5c9c6b59c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuffer.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuilder.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuilder.java index d61751deabf..7d85f7a6d77 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuilder.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_StringBuilder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_System_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_System_SM.java index 906fb9cf2ed..afc004fba1c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_System_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_System_SM.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread.java index 21c2a9a9f19..bf37b448e84 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup.java index 80e653e982b..2b57752a8e6 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup_SM.java index dcbc8650e26..98fa9963f06 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_ThreadGroup_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread_SM.java index 3193dec9dbb..1fb43d4e75a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Thread_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Throwable.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Throwable.java index dce03ccd0de..634bb166cbe 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Throwable.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_Throwable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_VMAccess.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_VMAccess.java index 49ca5b3a6d0..cffde89d937 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_VMAccess.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/Test_VMAccess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfo.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfo.java index 62af90e1a0e..e955bcb396f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfo.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.invoke.MethodHandles; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfoSubClass.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfoSubClass.java index aa341868ff1..3922233afe2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfoSubClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Helper_MethodHandleInfoSubClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.invoke.MethodHandles; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_AdaptorTests.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_AdaptorTests.java index c5e48a9e3b4..b088de2f1df 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_AdaptorTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_AdaptorTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo.java index c1afa28e0ef..054be57550d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo_SM.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo_SM.java index 72cf0661d19..dc176d5a639 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo_SM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/Test_MethodHandleInfo_SM.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePrivate.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePrivate.java index ea674d5b1f9..15840c093fe 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePrivate.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePrivate.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.invoke.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePublic.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePublic.java index 970ad84f0f2..51df941a317 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePublic.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/invoke/helpers/Helper_MethodHandleInfoOtherPackagePublic.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.invoke.*; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/MemoryMXBeanShutdownNotification.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/MemoryMXBeanShutdownNotification.java index 26472ec0dab..142cdec216d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/MemoryMXBeanShutdownNotification.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/MemoryMXBeanShutdownNotification.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest.java index 98f6cced9e1..257dc80f954 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest2.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest2.java index 014b0b05948..6db3de208f2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest2.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/APITest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BenchCurrentThreadCpuTime.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BenchCurrentThreadCpuTime.java index 5a4f40f6a2d..e4389840b89 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BenchCurrentThreadCpuTime.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BenchCurrentThreadCpuTime.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BlockedThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BlockedThread.java index 589deb91326..495c6566636 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BlockedThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/BlockedThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cmvc106800.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cmvc106800.java index 810fc2ca518..e90f7145e83 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cmvc106800.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cmvc106800.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cycle.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cycle.java index f837a8948b4..68990efec89 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cycle.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Cycle.java @@ -26,7 +26,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/DeadThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/DeadThread.java index 157b1d078a4..1ae20e8a1cd 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/DeadThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/DeadThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Deadlocks.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Deadlocks.java index d80310eb1b4..db420a3de55 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Deadlocks.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/Deadlocks.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ExitedThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ExitedThread.java index e3d46dfb0a2..f8e3bd00d7f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ExitedThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ExitedThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/FindDeadlockTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/FindDeadlockTest.java index 15b9a40c91b..1aa496938c8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/FindDeadlockTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/FindDeadlockTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/JoiningThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/JoiningThread.java index 7bcdf74837d..2c3edfb0659 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/JoiningThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/JoiningThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ManyInspectOne.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ManyInspectOne.java index 9b2dbd7d91a..4e2a1758f0f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ManyInspectOne.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ManyInspectOne.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MaxMonitorsTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MaxMonitorsTest.java index 2b1f6038b85..c696b89eb5d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MaxMonitorsTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MaxMonitorsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MonitorTraceTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MonitorTraceTest.java index b2ac1a8254d..5ad71b33c9e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MonitorTraceTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/MonitorTraceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NewThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NewThread.java index 1832e408f14..aff02e3d6db 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NewThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NewThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; import java.lang.management.ManagementFactory; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NoBlock.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NoBlock.java index 5fef6428e68..0ff57caa13d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NoBlock.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/NoBlock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ParkedThreadTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ParkedThreadTest.java index 96850feed10..bd1655920e8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ParkedThreadTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ParkedThreadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/RunnableThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/RunnableThread.java index ea303208cad..d34307379ad 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/RunnableThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/RunnableThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/SleepingThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/SleepingThread.java index 064a7091258..12867b54230 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/SleepingThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/SleepingThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StackDepth.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StackDepth.java index 18aa4b30b42..67e0b0ad6d0 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StackDepth.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StackDepth.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; import java.lang.management.ManagementFactory; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateBenchmark.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateBenchmark.java index a2bc427f6db..5f383095291 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateBenchmark.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateBenchmark.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateStress.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateStress.java index ae9ebf047e5..6c3a727ed3a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateStress.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/StateStress.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadListMutex.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadListMutex.java index 94bded11351..b99ce1a193d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadListMutex.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadListMutex.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedParkTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedParkTest.java index b56a98c9190..9e8b0a3cc49 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedParkTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedParkTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedWaitingThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedWaitingThread.java index 0ce49f07d70..e158b1d0a50 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedWaitingThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimedWaitingThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimersTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimersTest.java index 3f77cad440b..8eee3375843 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimersTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/TimersTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/WaitingThread.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/WaitingThread.java index f159c7d8408..96c88b7516f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/WaitingThread.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/management/ThreadMXBean/WaitingThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_PhantomReference.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_PhantomReference.java index 297c4c5c178..c661348f60f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_PhantomReference.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_PhantomReference.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_Reference.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_Reference.java index 38a648b0543..22c5a8abc8f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_Reference.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_Reference.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_ReferenceQueue.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_ReferenceQueue.java index 446776de4a0..3840d675849 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_ReferenceQueue.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_ReferenceQueue.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_SoftReference.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_SoftReference.java index 3e8bbba16df..73604a2cfe1 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_SoftReference.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_SoftReference.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_WeakReference.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_WeakReference.java index cd0aa618baa..b28ff6b72bc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_WeakReference.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/ref/Test_WeakReference.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Array.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Array.java index 7252d344df8..39f19247768 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Array.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Array.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Executable.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Executable.java index 7112ee34185..bbbf3f2b0cc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Executable.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/reflect/Test_Executable.java @@ -29,7 +29,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ @Test(groups = { "level.sanity" }) diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_CSuperA_SuperDuper.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_CSuperA_SuperDuper.java index fc694f66b19..f3412d181e3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_CSuperA_SuperDuper.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_CSuperA_SuperDuper.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public abstract class C_CSuperA_SuperDuper extends C_SuperA implements SuperDuper { diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_I_SupDuperSupA.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_I_SupDuperSupA.java index 80b0585b27a..b5a1271a00e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_I_SupDuperSupA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_I_SupDuperSupA.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public abstract class C_I_SupDuperSupA implements I_SupDuper_SupA { diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_SuperA.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_SuperA.java index 96ba9a0aea5..6fc50555643 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_SuperA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/C_SuperA.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public abstract class C_SuperA implements SuperA { diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/I_SupDuper_SupA.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/I_SupDuper_SupA.java index 79390b728c7..3ee62dc8ce3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/I_SupDuper_SupA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/I_SupDuper_SupA.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public interface I_SupDuper_SupA extends SuperDuper, SuperA {} diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/InterfaceTestClasses.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/InterfaceTestClasses.java index de0421b1439..de0ec8cc25b 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/InterfaceTestClasses.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/InterfaceTestClasses.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public abstract class InterfaceTestClasses{ diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperA.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperA.java index 5f46dd65a7b..740847d4912 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperA.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public interface SuperA extends SuperDuper { diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperDuper.java b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperDuper.java index edbdccde12e..2cea7902fcf 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperDuper.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/lang/specimens/SuperDuper.java @@ -21,7 +21,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public interface SuperDuper { diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/math/Test_BigDecimal.java b/test/functional/Java8andUp/src/org/openj9/test/java/math/Test_BigDecimal.java index 21242db98f1..047779029f2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/math/Test_BigDecimal.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/math/Test_BigDecimal.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/ChildMHLookupField.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/ChildMHLookupField.java index 0a253c2c14f..5e1012d0993 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/ChildMHLookupField.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/ChildMHLookupField.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.invoke.MethodHandles; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderOne.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderOne.java index e26b2aa006b..7cb9ab27928 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderOne.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderOne.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.InputStream; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderTwo.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderTwo.java index 8ba2ebfca20..f9c9625e5e3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderTwo.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/ClassLoaderTwo.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.InputStream; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/DigestLoop.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/DigestLoop.java index 9afb68252bf..a7818734069 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/DigestLoop.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/DigestLoop.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.MessageDigest; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/Dummy.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/Dummy.java index 7acd5f3fc32..6092d5d8344 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/Dummy.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/Dummy.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ // This class will be loaded by ClassLoaderOne and ClassLoaderTwo. diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidCBCKeySizeTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidCBCKeySizeTest.java index 39be444a41f..dce5e42e75d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidCBCKeySizeTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidCBCKeySizeTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.spec.AlgorithmParameterSpec; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidGCMKeySizeTest.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidGCMKeySizeTest.java index 9528bbba95f..681e3ad32b8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidGCMKeySizeTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/OpenSSLInvalidGCMKeySizeTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.spec.AlgorithmParameterSpec; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/Parent.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/Parent.java index 32a3cb4b27e..769ead71d86 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/Parent.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/Parent.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //This class will be loaded by ClassLoaderTwo. diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedAction.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedAction.java index b0b750c9a0d..69768761dbc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedAction.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedAction.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.security; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedExceptionAction.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedExceptionAction.java index 9a5d4b335c2..23f4eb6b136 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedExceptionAction.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/TestPrivilegedExceptionAction.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.security; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/TestURLClassLoader.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/TestURLClassLoader.java index 8860bed37f6..ca6d2e01422 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/TestURLClassLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/TestURLClassLoader.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessControlContext.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessControlContext.java index 2b757208f94..2f668e84a15 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessControlContext.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessControlContext.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessController.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessController.java index 5c42916be2a..fce9285508a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessController.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_AccessController.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.invoke.MethodHandles; diff --git a/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_MHLoaderConstraints.java b/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_MHLoaderConstraints.java index 8a871b2e162..46c57cb409e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_MHLoaderConstraints.java +++ b/test/functional/Java8andUp/src/org/openj9/test/java/security/Test_MHLoaderConstraints.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.reflect.Method; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateImplClass.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateImplClass.java index ee46b089169..347df233da4 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateImplClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateImplClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASM.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASM.java index b37b6d6f46d..c1eea722984 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForITestChild.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForITestChild.java index 7c8135f4ed0..720eb473920 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForITestChild.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForITestChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForNonStaticInvokeInterface.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForNonStaticInvokeInterface.java index 6a7544b7411..50ed11d202d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForNonStaticInvokeInterface.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForNonStaticInvokeInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForStaticInvokeInterface.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForStaticInvokeInterface.java index f904d868967..ef874a93b0e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForStaticInvokeInterface.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/GenerateInterfaceFromASMForStaticInvokeInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/LoadInterfaceContainingPrivateMethod.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/LoadInterfaceContainingPrivateMethod.java index 0fff942dc6b..b6f5b00bb2f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/LoadInterfaceContainingPrivateMethod.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/LoadInterfaceContainingPrivateMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ITestRunner.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ITestRunner.java index 846681553f8..c0162ad5290 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ITestRunner.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ITestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ReflectionAndMethodHandles.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ReflectionAndMethodHandles.java index f4d588d538a..a900557f525 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ReflectionAndMethodHandles.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ReflectionAndMethodHandles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ValidateReflectionWithExtensionMethods.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ValidateReflectionWithExtensionMethods.java index ede307d13dc..0b192e53ae9 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ValidateReflectionWithExtensionMethods.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/Test_ValidateReflectionWithExtensionMethods.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/I.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/I.java index b00ca2d794f..c3befadb2e4 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/I.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/I.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod.interfaces; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/J.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/J.java index 0e6bba34ab8..a69718425a5 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/J.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/J.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod.interfaces; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/K.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/K.java index f33b5aa5e90..07d563c0d4a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/K.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/K.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod.interfaces; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/L.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/L.java index 4ee48e95849..582549e480c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/L.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/L.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod.interfaces; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/N.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/N.java index 3112b2fe88f..b3d25df07b9 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/N.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/N.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod.interfaces; diff --git a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/O.java b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/O.java index 8e0691d2a7e..8e1b17ba7d3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/O.java +++ b/test/functional/Java8andUp/src/org/openj9/test/jsr335/interfacePrivateMethod/interfaces/O.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfacePrivateMethod.interfaces; diff --git a/test/functional/Java8andUp/src/org/openj9/test/management/AllocationGenerator.java b/test/functional/Java8andUp/src/org/openj9/test/management/AllocationGenerator.java index 978b0f4893e..b680d0819e8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/management/AllocationGenerator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/management/AllocationGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/Java8andUp/src/org/openj9/test/management/GarbageCollectionNotificationTest.java b/test/functional/Java8andUp/src/org/openj9/test/management/GarbageCollectionNotificationTest.java index 9c2cb66943e..b76bbfa5dba 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/management/GarbageCollectionNotificationTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/management/GarbageCollectionNotificationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.management; diff --git a/test/functional/Java8andUp/src/org/openj9/test/nogc/Allocator.java b/test/functional/Java8andUp/src/org/openj9/test/nogc/Allocator.java index a36e2b8c506..7b98b168faf 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/nogc/Allocator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/nogc/Allocator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nogc; diff --git a/test/functional/Java8andUp/src/org/openj9/test/nogc/TestGCPolicyNogc.java b/test/functional/Java8andUp/src/org/openj9/test/nogc/TestGCPolicyNogc.java index 427ae61c7fd..2c4827f4bf5 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/nogc/TestGCPolicyNogc.java +++ b/test/functional/Java8andUp/src/org/openj9/test/nogc/TestGCPolicyNogc.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nogc; diff --git a/test/functional/Java8andUp/src/org/openj9/test/nogc/TestNogcDieWithOOM.java b/test/functional/Java8andUp/src/org/openj9/test/nogc/TestNogcDieWithOOM.java index 9ddc7273924..e540fdfa058 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/nogc/TestNogcDieWithOOM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/nogc/TestNogcDieWithOOM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nogc; diff --git a/test/functional/Java8andUp/src/org/openj9/test/osthread/ReattachAfterExit.java b/test/functional/Java8andUp/src/org/openj9/test/osthread/ReattachAfterExit.java index 6453fe056c7..b52901a8bb3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/osthread/ReattachAfterExit.java +++ b/test/functional/Java8andUp/src/org/openj9/test/osthread/ReattachAfterExit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.osthread; diff --git a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/BooleanAnnotation.java b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/BooleanAnnotation.java index 2b8b29d1779..47369bda193 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/BooleanAnnotation.java +++ b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/BooleanAnnotation.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation1.java b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation1.java index 3b062b23d71..ebff7cf4903 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation1.java +++ b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation1.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation2.java b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation2.java index 3b3f7702ef6..a0162b8b0ed 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation2.java +++ b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotation2.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotationArray.java b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotationArray.java index ed2ec58ea0f..936defdd789 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotationArray.java +++ b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/MyAnnotationArray.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/Tests.java b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/Tests.java index f1fba57bb81..20684646162 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/Tests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/pmr/failures/Tests.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/CImplements_I_J.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/CImplements_I_J.java index e6e410cd517..83fbd517bcd 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/CImplements_I_J.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/CImplements_I_J.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/C_CSuperA_SuperDuper.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/C_CSuperA_SuperDuper.java index 951f854ea2c..404dc720c3c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/C_CSuperA_SuperDuper.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/C_CSuperA_SuperDuper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/C_I_SupDuperSupA.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/C_I_SupDuperSupA.java index 822f95fb609..dab53f57e92 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/C_I_SupDuperSupA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/C_I_SupDuperSupA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/C_SuperA.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/C_SuperA.java index 228498060f5..4ee9c1fa488 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/C_SuperA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/C_SuperA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/ExampleClass.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/ExampleClass.java index 1eb4e7bdd97..6379d00efb5 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/ExampleClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/ExampleClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorTests.java index 77d579a3b3d..0915841b024 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorsTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorsTests.java index b47c23dee3a..6b3b879cf88 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetConstructorsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorTests.java index 33e811ca40f..e84d1e579aa 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorsTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorsTests.java index d104d097c6b..9546a23354d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredConstructorsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldTests.java index 7d76bf4fe04..d041f1f3dbc 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldsTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldsTests.java index 996f7fd2539..fb1d35f6f7e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredFieldsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodTests.java index e2575befedd..26244612fff 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodsTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodsTests.java index 465c2e1b45e..075a678435c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetDeclaredMethodsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldTests.java index d829926fe69..ec3d7f593da 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldsTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldsTests.java index 3c52aa35333..e65fb85cf06 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetFieldsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodTests.java index 9e577a23bce..ab9c5bac65d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodTests.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodsTests.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodsTests.java index 4072e63c9bd..ee0447a33e7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodsTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/GetMethodsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/I.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/I.java index 09c47b4427e..797e28de894 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/I.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/I.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/I_SupDuper_SupA.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/I_SupDuper_SupA.java index 8003273ca32..b2946f063a9 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/I_SupDuper_SupA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/I_SupDuper_SupA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/J.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/J.java index 290dc3088ee..d300a7f961c 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/J.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/J.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperA.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperA.java index b9f13e89da4..718bdf9e41a 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperA.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperDuper.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperDuper.java index 2d7e5c3be54..5203d3abc6d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperDuper.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/SuperDuper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmGenerator.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmGenerator.java index 96c07715cf1..274283a2ba5 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmGenerator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect.defendersupersends.asm; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmLoader.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmLoader.java index a94e26abdae..7df183a96f3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmLoader.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect.defendersupersends.asm; diff --git a/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmTestcaseGenerator.java b/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmTestcaseGenerator.java index efe1fd877dc..1904711eb8d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmTestcaseGenerator.java +++ b/test/functional/Java8andUp/src/org/openj9/test/reflect/defendersupersends/asm/AsmTestcaseGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.reflect.defendersupersends.asm; diff --git a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc191564.java b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc191564.java index 67d34ae5fa8..04cc63c9858 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc191564.java +++ b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc191564.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; diff --git a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc194280.java b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc194280.java index 0f0be8c45ff..4777e5fc345 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc194280.java +++ b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc194280.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; import sun.misc.Unsafe; diff --git a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc196849.java b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc196849.java index c04b3d98020..d91eeae5534 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc196849.java +++ b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc196849.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; diff --git a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc199515.java b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc199515.java index 52541c3e0e5..527eca5309e 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc199515.java +++ b/test/functional/Java8andUp/src/org/openj9/test/regression/Cmvc199515.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; diff --git a/test/functional/Java8andUp/src/org/openj9/test/runlast/Test_JavaNetWithSideEffectsShouldRunLast.java b/test/functional/Java8andUp/src/org/openj9/test/runlast/Test_JavaNetWithSideEffectsShouldRunLast.java index 3f4ffd1865b..65146fe3709 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/runlast/Test_JavaNetWithSideEffectsShouldRunLast.java +++ b/test/functional/Java8andUp/src/org/openj9/test/runlast/Test_JavaNetWithSideEffectsShouldRunLast.java @@ -23,7 +23,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* diff --git a/test/functional/Java8andUp/src/org/openj9/test/string/StringInterning.java b/test/functional/Java8andUp/src/org/openj9/test/string/StringInterning.java index 7b8ca567238..d989891bca7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/string/StringInterning.java +++ b/test/functional/Java8andUp/src/org/openj9/test/string/StringInterning.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.string; diff --git a/test/functional/Java8andUp/src/org/openj9/test/string/StringStreams.java b/test/functional/Java8andUp/src/org/openj9/test/string/StringStreams.java index b82049cb460..5f01edb93e8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/string/StringStreams.java +++ b/test/functional/Java8andUp/src/org/openj9/test/string/StringStreams.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.string; diff --git a/test/functional/Java8andUp/src/org/openj9/test/support/Support_15Help.java b/test/functional/Java8andUp/src/org/openj9/test/support/Support_15Help.java index 10535671bec..30339badce6 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/support/Support_15Help.java +++ b/test/functional/Java8andUp/src/org/openj9/test/support/Support_15Help.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Support_15Help { diff --git a/test/functional/Java8andUp/src/org/openj9/test/support/Support_Exec.java b/test/functional/Java8andUp/src/org/openj9/test/support/Support_Exec.java index ea1b54f24d4..a68c60c0cc0 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/support/Support_Exec.java +++ b/test/functional/Java8andUp/src/org/openj9/test/support/Support_Exec.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/test/support/Support_ExtendedTestEnvironment.java b/test/functional/Java8andUp/src/org/openj9/test/support/Support_ExtendedTestEnvironment.java index c90f02782f6..d6ef4186c0f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/support/Support_ExtendedTestEnvironment.java +++ b/test/functional/Java8andUp/src/org/openj9/test/support/Support_ExtendedTestEnvironment.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Support_ExtendedTestEnvironment { diff --git a/test/functional/Java8andUp/src/org/openj9/test/support/resource/Support_Resources.java b/test/functional/Java8andUp/src/org/openj9/test/support/resource/Support_Resources.java index 2ee5fc1b09d..a7fa1c3e8b8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/support/resource/Support_Resources.java +++ b/test/functional/Java8andUp/src/org/openj9/test/support/resource/Support_Resources.java @@ -32,7 +32,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/Java8andUp/src/org/openj9/test/truncatedReturn/TestTruncatedReturn.java b/test/functional/Java8andUp/src/org/openj9/test/truncatedReturn/TestTruncatedReturn.java index 11f3f153a2e..90e14d04dc2 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/truncatedReturn/TestTruncatedReturn.java +++ b/test/functional/Java8andUp/src/org/openj9/test/truncatedReturn/TestTruncatedReturn.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.truncatedReturn; diff --git a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/AnnotatedTypeParameterTestClass.java b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/AnnotatedTypeParameterTestClass.java index 247e99a209d..71803fa3877 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/AnnotatedTypeParameterTestClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/AnnotatedTypeParameterTestClass.java @@ -26,7 +26,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * Test case to exercise type annotations on generics. diff --git a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClass.java b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClass.java index ded324eb532..92544541bc3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClass.java +++ b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClass.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * This generates a class file containing annotations in various locations specified by JSR 308 - Annotations on Types. diff --git a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClassTest.java b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClassTest.java index 8a031b86f05..6a2f354607d 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClassTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotatedTestClassTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotationUtils.java b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotationUtils.java index 7c0f1ad6bd1..b00b38d67ed 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotationUtils.java +++ b/test/functional/Java8andUp/src/org/openj9/test/typeAnnotation/TypeAnnotationUtils.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Java8andUp/src/org/openj9/test/unsafe/fence/Test_UnsafeFence.java b/test/functional/Java8andUp/src/org/openj9/test/unsafe/fence/Test_UnsafeFence.java index 6bed67577bc..5c447cd93ab 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/unsafe/fence/Test_UnsafeFence.java +++ b/test/functional/Java8andUp/src/org/openj9/test/unsafe/fence/Test_UnsafeFence.java @@ -25,7 +25,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ @Test(groups = { "level.sanity" }) public class Test_UnsafeFence { diff --git a/test/functional/Java8andUp/src/org/openj9/test/utf8ClassPkgName/LoadClassWithUTF8PkgNameTest.java b/test/functional/Java8andUp/src/org/openj9/test/utf8ClassPkgName/LoadClassWithUTF8PkgNameTest.java index f7b5fa44c7d..dbb7b821ba8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/utf8ClassPkgName/LoadClassWithUTF8PkgNameTest.java +++ b/test/functional/Java8andUp/src/org/openj9/test/utf8ClassPkgName/LoadClassWithUTF8PkgNameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.utf8ClassPkgName; diff --git a/test/functional/Java8andUp/src/org/openj9/test/vm/Test_MsgHelp.java b/test/functional/Java8andUp/src/org/openj9/test/vm/Test_MsgHelp.java index 6f8b9466c7d..ee761679e1f 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/vm/Test_MsgHelp.java +++ b/test/functional/Java8andUp/src/org/openj9/test/vm/Test_MsgHelp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.vm; diff --git a/test/functional/Java8andUp/src/org/openj9/test/vm/Test_VM.java b/test/functional/Java8andUp/src/org/openj9/test/vm/Test_VM.java index 9a549ba1f20..e11e92595d8 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/vm/Test_VM.java +++ b/test/functional/Java8andUp/src/org/openj9/test/vm/Test_VM.java @@ -23,7 +23,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ @Test(groups = { "level.sanity" }) diff --git a/test/functional/Java8andUp/src/org/openj9/test/vmArguments/ArgumentDumper.java b/test/functional/Java8andUp/src/org/openj9/test/vmArguments/ArgumentDumper.java index 67d95a1056f..9307cc38d96 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/vmArguments/ArgumentDumper.java +++ b/test/functional/Java8andUp/src/org/openj9/test/vmArguments/ArgumentDumper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.vmArguments; diff --git a/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java b/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java index 16ce1ea33c4..578818586d3 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java +++ b/test/functional/Java8andUp/src/org/openj9/test/vmArguments/VmArgumentTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.vmArguments; diff --git a/test/functional/Java8andUp/src/org/openj9/test/vmcheck/ClassloadingTester.java b/test/functional/Java8andUp/src/org/openj9/test/vmcheck/ClassloadingTester.java index dd9ddc4a298..93a687439a7 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/vmcheck/ClassloadingTester.java +++ b/test/functional/Java8andUp/src/org/openj9/test/vmcheck/ClassloadingTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.vmcheck; diff --git a/test/functional/Java8andUp/src/org/openj9/test/vmcheck/TestLoadingClassesFromJarfile.java b/test/functional/Java8andUp/src/org/openj9/test/vmcheck/TestLoadingClassesFromJarfile.java index d2ebe95c106..d0a7cadbe52 100644 --- a/test/functional/Java8andUp/src/org/openj9/test/vmcheck/TestLoadingClassesFromJarfile.java +++ b/test/functional/Java8andUp/src/org/openj9/test/vmcheck/TestLoadingClassesFromJarfile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.vmcheck; diff --git a/test/functional/Java8andUp/src/sun/misc/test/RestrictedClass.java b/test/functional/Java8andUp/src/sun/misc/test/RestrictedClass.java index b6d2d2d67dc..5de5489d180 100644 --- a/test/functional/Java8andUp/src/sun/misc/test/RestrictedClass.java +++ b/test/functional/Java8andUp/src/sun/misc/test/RestrictedClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/Java8andUp/src/sun/misc/test/RestrictedInterface.java b/test/functional/Java8andUp/src/sun/misc/test/RestrictedInterface.java index 8d70adee939..3a2070f494f 100644 --- a/test/functional/Java8andUp/src/sun/misc/test/RestrictedInterface.java +++ b/test/functional/Java8andUp/src/sun/misc/test/RestrictedInterface.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/Java8andUp/src_110/org/openj9/test/jdk/internal/InternalAccessor.java b/test/functional/Java8andUp/src_110/org/openj9/test/jdk/internal/InternalAccessor.java index f7466ebabb7..e7f8d1584c7 100644 --- a/test/functional/Java8andUp/src_110/org/openj9/test/jdk/internal/InternalAccessor.java +++ b/test/functional/Java8andUp/src_110/org/openj9/test/jdk/internal/InternalAccessor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jdk.internal; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java index e74c2617ac1..fa2c7425394 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.Assert; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/contendedfields/TestClasses.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/contendedfields/TestClasses.java index 2e7947bd16c..f7a564e73fe 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/contendedfields/TestClasses.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/contendedfields/TestClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Class.java index 017eb4fabf2..6534ddc9358 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Class.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.AfterMethod; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Package.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Package.java index 8c8a9598282..b2da9a9cbef 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Package.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Package.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_System.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_System.java index a1fe2ddf7eb..d99ff43183a 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_System.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_System.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Thread_Extra.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Thread_Extra.java index fe49776b5e3..672bb048a4c 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Thread_Extra.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/Test_Thread_Extra.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Test_Thread_Extra { diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java index 453e66484fc..ea5684b188a 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/regression/Cmvc194781.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/regression/Cmvc194781.java index 389e69031a8..c76b93c7d66 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/regression/Cmvc194781.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/regression/Cmvc194781.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; diff --git a/test/functional/Java8andUp/src_110_up/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java b/test/functional/Java8andUp/src_110_up/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java index fe1aed2747e..c96d6128546 100644 --- a/test/functional/Java8andUp/src_110_up/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java +++ b/test/functional/Java8andUp/src_110_up/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src_120/org/openj9/test/jdk/internal/InternalAccessor.java b/test/functional/Java8andUp/src_120/org/openj9/test/jdk/internal/InternalAccessor.java index 1b8e81142fc..47345c2ec6e 100644 --- a/test/functional/Java8andUp/src_120/org/openj9/test/jdk/internal/InternalAccessor.java +++ b/test/functional/Java8andUp/src_120/org/openj9/test/jdk/internal/InternalAccessor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jdk.internal; diff --git a/test/functional/Java8andUp/src_170/org/openj9/test/jdk/internal/InternalAccessor.java b/test/functional/Java8andUp/src_170/org/openj9/test/jdk/internal/InternalAccessor.java index 1b8e81142fc..47345c2ec6e 100644 --- a/test/functional/Java8andUp/src_170/org/openj9/test/jdk/internal/InternalAccessor.java +++ b/test/functional/Java8andUp/src_170/org/openj9/test/jdk/internal/InternalAccessor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jdk.internal; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java b/test/functional/Java8andUp/src_80/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java index b05ecf41c30..4a8c810bb52 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/annotation/ContainsRuntimeAnnotationTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.Assert; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/contendedfields/TestClasses.java b/test/functional/Java8andUp/src_80/org/openj9/test/contendedfields/TestClasses.java index 4358e4552c4..db16d85922e 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/contendedfields/TestClasses.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/contendedfields/TestClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Class.java index a82c39076dc..b13e82ab978 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Class.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.AfterMethod; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Package.java b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Package.java index 22a7c287ad6..7809eb9e4b5 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Package.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Package.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_System.java b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_System.java index dbdbeb7db99..5c5f063c2dd 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_System.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_System.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Thread_Extra.java b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Thread_Extra.java index e1b9cdb2bb9..90ddc047204 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Thread_Extra.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/Test_Thread_Extra.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.AfterMethod; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java index c776a82cc88..a8449cbc5f3 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/jdk/internal/agent/Test_FileSystem.java b/test/functional/Java8andUp/src_80/org/openj9/test/jdk/internal/agent/Test_FileSystem.java index 9fe43b9aa25..24aff8f0c84 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/jdk/internal/agent/Test_FileSystem.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/jdk/internal/agent/Test_FileSystem.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.jdk.internal.agent.Test_FileSystem_Base; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/regression/Cmvc194781.java b/test/functional/Java8andUp/src_80/org/openj9/test/regression/Cmvc194781.java index 3a9f0a98c2e..4d3bae2a5c4 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/regression/Cmvc194781.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/regression/Cmvc194781.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; diff --git a/test/functional/Java8andUp/src_80/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java b/test/functional/Java8andUp/src_80/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java index c4e8ceb52a0..5695ee2720c 100644 --- a/test/functional/Java8andUp/src_80/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java +++ b/test/functional/Java8andUp/src_80/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/contendedfields/TestClasses.java b/test/functional/Java8andUp/src_90/org/openj9/test/contendedfields/TestClasses.java index 2e7947bd16c..f7a564e73fe 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/contendedfields/TestClasses.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/contendedfields/TestClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.contendedfields; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Class.java index a9a3593afbc..fbd0d12ddf2 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Class.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.AfterMethod; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Package.java b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Package.java index 22a7c287ad6..7809eb9e4b5 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Package.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_Package.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_System.java b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_System.java index 2a02ad02db6..601a770129a 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_System.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/Test_System.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java index 453e66484fc..ea5684b188a 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/regression/Cmvc194781.java b/test/functional/Java8andUp/src_90/org/openj9/test/regression/Cmvc194781.java index 3a9f0a98c2e..4d3bae2a5c4 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/regression/Cmvc194781.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/regression/Cmvc194781.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.regression; diff --git a/test/functional/Java8andUp/src_90/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java b/test/functional/Java8andUp/src_90/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java index 74b5c8e54ce..5ce5023d37b 100644 --- a/test/functional/Java8andUp/src_90/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java +++ b/test/functional/Java8andUp/src_90/org/openj9/test/typeAnnotation/IbmTypeAnnotationsApiTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Java8andUp/src_90_current/org/openj9/test/jdk/internal/agent/Test_FileSystem.java b/test/functional/Java8andUp/src_90_current/org/openj9/test/jdk/internal/agent/Test_FileSystem.java index e7fc762364b..dc70b437e1e 100644 --- a/test/functional/Java8andUp/src_90_current/org/openj9/test/jdk/internal/agent/Test_FileSystem.java +++ b/test/functional/Java8andUp/src_90_current/org/openj9/test/jdk/internal/agent/Test_FileSystem.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.jdk.internal.agent.Test_FileSystem_Base; diff --git a/test/functional/Java8andUp/src_90_latest/org/openj9/test/jdk/internal/agent/Test_FileSystem.java b/test/functional/Java8andUp/src_90_latest/org/openj9/test/jdk/internal/agent/Test_FileSystem.java index 03969a817c2..2027ca40120 100644 --- a/test/functional/Java8andUp/src_90_latest/org/openj9/test/jdk/internal/agent/Test_FileSystem.java +++ b/test/functional/Java8andUp/src_90_latest/org/openj9/test/jdk/internal/agent/Test_FileSystem.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.openj9.test.jdk.internal.agent.Test_FileSystem_Base; diff --git a/test/functional/Java8andUp/testacc.policy b/test/functional/Java8andUp/testacc.policy index 3fc74a2b833..29aeb2ca676 100644 --- a/test/functional/Java8andUp/testacc.policy +++ b/test/functional/Java8andUp/testacc.policy @@ -16,7 +16,7 @@ // [1] https://www.gnu.org/software/classpath/license.html // [2] https://openjdk.org/legal/assembly-exception.html // -// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 grant { // so we can remove the security manager diff --git a/test/functional/Java8andUp/testng.xml b/test/functional/Java8andUp/testng.xml index 028b1e91eff..a0dfd6f506d 100644 --- a/test/functional/Java8andUp/testng.xml +++ b/test/functional/Java8andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java8andUp/testng_sm.xml b/test/functional/Java8andUp/testng_sm.xml index 89b53513caa..e53a7f2dcf5 100644 --- a/test/functional/Java8andUp/testng_sm.xml +++ b/test/functional/Java8andUp/testng_sm.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java9andUp/build.xml b/test/functional/Java9andUp/build.xml index 22c838fedc6..c906f39c1a3 100644 --- a/test/functional/Java9andUp/build.xml +++ b/test/functional/Java9andUp/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java9andUp/methodvisibilitytests.xml b/test/functional/Java9andUp/methodvisibilitytests.xml index 6b742395d33..0e220f70f77 100644 --- a/test/functional/Java9andUp/methodvisibilitytests.xml +++ b/test/functional/Java9andUp/methodvisibilitytests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java9andUp/modules/README.md b/test/functional/Java9andUp/modules/README.md index e0ae7e2aa30..5fa0dcbf94b 100644 --- a/test/functional/Java9andUp/modules/README.md +++ b/test/functional/Java9andUp/modules/README.md @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Introduction diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.common/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.common/module-info.java index dcd45923eee..0ceda3e4f4d 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.common/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.common/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.common { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.common/org/openj9/test/modularity/common/VisibilityTester.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.common/org/openj9/test/modularity/common/VisibilityTester.java index dcdfcf855e5..9be79a2f97c 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.common/org/openj9/test/modularity/common/VisibilityTester.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.common/org/openj9/test/modularity/common/VisibilityTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.common; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/module-info.java index 4b88ecc20f1..124e8c3b409 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.dummy { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/org/openj9/test/modularity/dummy/Dummy.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/org/openj9/test/modularity/dummy/Dummy.java index e47455abcbe..93a3a0baf72 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/org/openj9/test/modularity/dummy/Dummy.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.dummy/org/openj9/test/modularity/dummy/Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.dummy; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/module-info.java index 7a550bedf83..d3e5e20930f 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.moduleA { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAe/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAe/Klass.java index fb1a8cf2bc0..8695876a877 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAe/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAe/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgAe; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAo/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAo/Klass.java index f768ad7fb0f..41c3fa9e3df 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAo/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAo/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgAo; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAr/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAr/Klass.java index ef6f717418c..7c68f7aca1d 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAr/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleA/org/openj9/test/modularity/pkgAr/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgAr; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/module-info.java index fd5e45466b4..5ab860efc4f 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.moduleB { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBe/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBe/Klass.java index 3693bae1b95..3949372068a 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBe/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBe/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgBe; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBo/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBo/Klass.java index 61c6d640678..5c265b17b51 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBo/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBo/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgBo; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBr/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBr/Klass.java index c77bc915791..a83954f31bd 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBr/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleB/org/openj9/test/modularity/pkgBr/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgBr; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/module-info.java index 0edddda5ad4..100f551224c 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.moduleC { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCe/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCe/Klass.java index abf41fcd923..b20c49709db 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCe/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCe/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgCe; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCo/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCo/Klass.java index 8dc35d11199..6285f5bf604 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCo/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCo/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgCo; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCr/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCr/Klass.java index 0d3bd84eacd..52c34e09b63 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCr/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleC/org/openj9/test/modularity/pkgCr/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgCr; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/module-info.java index 31c7a8eecbf..ef8488ed8df 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.moduleD { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDe/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDe/Klass.java index ca3e9b75fb0..fff1faab48c 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDe/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDe/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgDe; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDo/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDo/Klass.java index 86ce0f9b019..c9dcd6111da 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDo/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDo/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgDo; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDr/Klass.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDr/Klass.java index ba7c08bf3b6..1435d90b990 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDr/Klass.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.moduleD/org/openj9/test/modularity/pkgDr/Klass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.pkgDr; public class Klass { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/module-info.java index c3377868a84..397db998028 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.testUnreflect { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/org/openj9/test/modularity/tests/UnreflectTests.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/org/openj9/test/modularity/tests/UnreflectTests.java index 3ee33814132..c8e06c46528 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/org/openj9/test/modularity/tests/UnreflectTests.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testUnreflect/org/openj9/test/modularity/tests/UnreflectTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.tests; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/module-info.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/module-info.java index 98b130da754..ef925b5a439 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/module-info.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module org.openj9test.modularity.testerModule { diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.jasm b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.jasm index e67526c2310..486d43eba41 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.jasm +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.jasm @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ class org/openj9/test/modularity/tests/MethodHandleTester version 52:0 diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.java index 6998434f748..658f1c4c1a3 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodHandleTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.tests; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodVisibilityTests.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodVisibilityTests.java index 3908470d575..45fe4a690a2 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodVisibilityTests.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/MethodVisibilityTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.tests; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/README.md b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/README.md index 663756b4977..174ccba064d 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/README.md +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/README.md @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Description diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/VisibilityTesterImpl.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/VisibilityTesterImpl.java index 97602787516..3319d783103 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/VisibilityTesterImpl.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.testerModule/org/openj9/test/modularity/tests/VisibilityTesterImpl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity.tests; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/README.md b/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/README.md index a780e14fc50..689c2f8612c 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/README.md +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/README.md @@ -17,7 +17,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Description diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedDummy.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedDummy.java index d4684ca59fd..a1fd479e954 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedDummy.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedDummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unnamed; diff --git a/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedReflectObjects.java b/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedReflectObjects.java index e508ac2ff07..a16a5faeaeb 100644 --- a/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedReflectObjects.java +++ b/test/functional/Java9andUp/modules/org.openj9test.modularity.unnamed/org/openj9/test/unnamed/UnnamedReflectObjects.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unnamed; diff --git a/test/functional/Java9andUp/playlist.xml b/test/functional/Java9andUp/playlist.xml index f537327fa5f..30105a83e44 100644 --- a/test/functional/Java9andUp/playlist.xml +++ b/test/functional/Java9andUp/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java9andUp/src/org/openj9/test/attachAPI/SelfAttacher.java b/test/functional/Java9andUp/src/org/openj9/test/attachAPI/SelfAttacher.java index 7acdef448f5..be5e0d9be94 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/attachAPI/SelfAttacher.java +++ b/test/functional/Java9andUp/src/org/openj9/test/attachAPI/SelfAttacher.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java9andUp/src/org/openj9/test/attachAPI/TestJava9AttachAPI.java b/test/functional/Java9andUp/src/org/openj9/test/attachAPI/TestJava9AttachAPI.java index ecb23b24ec9..fb13cbf31cd 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/attachAPI/TestJava9AttachAPI.java +++ b/test/functional/Java9andUp/src/org/openj9/test/attachAPI/TestJava9AttachAPI.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/Java9andUp/src/org/openj9/test/constantPoolTags/ConstantPoolTagTests.java b/test/functional/Java9andUp/src/org/openj9/test/constantPoolTags/ConstantPoolTagTests.java index 89a8e6ad6b1..a23c85396f4 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/constantPoolTags/ConstantPoolTagTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/constantPoolTags/ConstantPoolTagTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.constantPoolTags; diff --git a/test/functional/Java9andUp/src/org/openj9/test/defineModuleAsClass/DefineModuleAsClassTest.java b/test/functional/Java9andUp/src/org/openj9/test/defineModuleAsClass/DefineModuleAsClassTest.java index d3be82174eb..085bc3322b5 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/defineModuleAsClass/DefineModuleAsClassTest.java +++ b/test/functional/Java9andUp/src/org/openj9/test/defineModuleAsClass/DefineModuleAsClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.defineModuleAsClass; diff --git a/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Class.java b/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Class.java index 39ed0694400..29f8e440f2a 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Class.java +++ b/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Class.java @@ -28,7 +28,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ @Test(groups = { "level.sanity" }) diff --git a/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Math_Fma.java b/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Math_Fma.java index 48d3028950f..d15dabdd33c 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Math_Fma.java +++ b/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_Math_Fma.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_StrictMath_Fma.java b/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_StrictMath_Fma.java index fcf587dd722..85bab68f351 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_StrictMath_Fma.java +++ b/test/functional/Java9andUp/src/org/openj9/test/java/lang/Test_StrictMath_Fma.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang; diff --git a/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoader.java b/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoader.java index 098c8771a9f..93509c6720f 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoader.java +++ b/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity; diff --git a/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoaderFindResource.java b/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoaderFindResource.java index f20ed530407..7c459d3d7b1 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoaderFindResource.java +++ b/test/functional/Java9andUp/src/org/openj9/test/modularity/TestClassLoaderFindResource.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.modularity; diff --git a/test/functional/Java9andUp/src/org/openj9/test/stackWalker/MyRunnable.java b/test/functional/Java9andUp/src/org/openj9/test/stackWalker/MyRunnable.java index b2b61863e5c..5ec6fb965d8 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/stackWalker/MyRunnable.java +++ b/test/functional/Java9andUp/src/org/openj9/test/stackWalker/MyRunnable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.stackWalker; diff --git a/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerCallerSensitiveTest.java b/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerCallerSensitiveTest.java index 5fb47c73968..15257c3157e 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerCallerSensitiveTest.java +++ b/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerCallerSensitiveTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.stackWalker; diff --git a/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerTest.java b/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerTest.java index 35eed993c02..1d6e7ed0463 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerTest.java +++ b/test/functional/Java9andUp/src/org/openj9/test/stackWalker/StackWalkerTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.stackWalker; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayHelper.java index f68603c6229..0260c67fd10 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayVarHandleTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayVarHandleTests.java index 02d71743745..c31d126feae 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayVarHandleTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ArrayVarHandleTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewHelper.java index a25cf327d58..8aa99a466e4 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewVarHandleTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewVarHandleTests.java index 2abc1e9a947..85c1eda821d 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewVarHandleTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteArrayViewVarHandleTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewHelper.java index 33337cb63d3..01a6c1118d3 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewVarHandleTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewVarHandleTests.java index 68ebefec57b..a4e76da4c69 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewVarHandleTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ByteBufferViewVarHandleTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ConstantsHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ConstantsHelper.java index 6344e5de1a3..138c14a6e70 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ConstantsHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ConstantsHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceFieldVarHandleTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceFieldVarHandleTests.java index f197f69b4ae..793d607ea86 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceFieldVarHandleTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceFieldVarHandleTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceHelper.java index bb55276c8e7..540805d27b1 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/InstanceHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/LookupTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/LookupTests.java index dc0d0f064d1..3164f3db9e5 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/LookupTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/LookupTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticFieldVarHandleTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticFieldVarHandleTests.java index d73f853e74c..2747465e05d 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticFieldVarHandleTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticFieldVarHandleTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelper.java index 765c1f46581..17d97a50cfe 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelperChild.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelperChild.java index 7615e2ed889..e53a04fceaf 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelperChild.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/StaticHelperChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleFenceTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleFenceTests.java index e99c76202a8..a7890c34efb 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleFenceTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleFenceTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleInvokerTest.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleInvokerTest.java index cf02ffa50b8..9dd919652a9 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleInvokerTest.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleInvokerTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleUtilTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleUtilTests.java index 449ea73917f..eaad3728b5a 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleUtilTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/VarHandleUtilTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewHelper.java index f7a5ce5e253..fd3c6a25d98 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewVarHandleTests.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewVarHandleTests.java index ef65baffbf3..82a94e93142 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewVarHandleTests.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/ViewVarHandleTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle; diff --git a/test/functional/Java9andUp/src/org/openj9/test/varhandle/otherpkg/OtherPackageHelper.java b/test/functional/Java9andUp/src/org/openj9/test/varhandle/otherpkg/OtherPackageHelper.java index ec02f94d7d8..9cb791dd1e6 100644 --- a/test/functional/Java9andUp/src/org/openj9/test/varhandle/otherpkg/OtherPackageHelper.java +++ b/test/functional/Java9andUp/src/org/openj9/test/varhandle/otherpkg/OtherPackageHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.varhandle.otherpkg; diff --git a/test/functional/Java9andUp/testUnreflect.xml b/test/functional/Java9andUp/testUnreflect.xml index f14e7ec2e2e..3c984807455 100644 --- a/test/functional/Java9andUp/testUnreflect.xml +++ b/test/functional/Java9andUp/testUnreflect.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Java9andUp/testng.xml b/test/functional/Java9andUp/testng.xml index a4d47949ace..03509dc6492 100644 --- a/test/functional/Java9andUp/testng.xml +++ b/test/functional/Java9andUp/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JavaAgentTest/build.xml b/test/functional/JavaAgentTest/build.xml index 2c24d5d50cf..948b292840e 100644 --- a/test/functional/JavaAgentTest/build.xml +++ b/test/functional/JavaAgentTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JavaAgentTest/playlist.xml b/test/functional/JavaAgentTest/playlist.xml index ff5c2cf3660..35df9dc2f86 100644 --- a/test/functional/JavaAgentTest/playlist.xml +++ b/test/functional/JavaAgentTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/AgentMain.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/AgentMain.java index a9042dc419b..5188983501e 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/AgentMain.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/AgentMain.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/GCRetransformTest.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/GCRetransformTest.java index 412f043c619..a0db35e828c 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/GCRetransformTest.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/GCRetransformTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_ExtendedHCR_Test.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_ExtendedHCR_Test.java index c8338053a6c..8ff548f04af 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_ExtendedHCR_Test.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_ExtendedHCR_Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_FastHCR_Test.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_FastHCR_Test.java index 1f042eab109..24e982571f9 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_FastHCR_Test.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_FastHCR_Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_NoBCI_Test.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_NoBCI_Test.java index a2650d6c7f8..633a960405e 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_NoBCI_Test.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/RefreshGCCache_NoBCI_Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Source.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Source.java index 9d13b0077e3..0e1f31eaa27 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Source.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Source.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Transformer.java b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Transformer.java index 7f744b9d3da..86474e6b049 100644 --- a/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Transformer.java +++ b/test/functional/JavaAgentTest/src/org/openj9/test/javaagenttest/util/Transformer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/Cmvc196982.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/Cmvc196982.java index cd9184b8318..a49d7259454 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/Cmvc196982.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/Cmvc196982.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/CustomClassVisitor.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/CustomClassVisitor.java index 095da1701b5..0cbfa0fe8be 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/CustomClassVisitor.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/CustomClassVisitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/FieldAdder.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/FieldAdder.java index b146d86bcc4..e60743fae4e 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/FieldAdder.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/FieldAdder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodAddAdapter.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodAddAdapter.java index ef3358bf282..438bffd0b54 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodAddAdapter.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodAddAdapter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java index f435ba39fce..11cd84cc34b 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java index 25d721f9161..e99a8ef31e7 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; import jdk.internal.org.objectweb.asm.Label; diff --git a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java index c151dc53bcd..c685a356eb3 100644 --- a/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java +++ b/test/functional/JavaAgentTest/src_java12/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; import jdk.internal.org.objectweb.asm.Label; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/Cmvc196982.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/Cmvc196982.java index 03891080dc4..8cee5faf8be 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/Cmvc196982.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/Cmvc196982.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/CustomClassVisitor.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/CustomClassVisitor.java index eeb4320ca6b..e5e65352fca 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/CustomClassVisitor.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/CustomClassVisitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/FieldAdder.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/FieldAdder.java index 8ab408b6a9c..a6fe05aebd5 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/FieldAdder.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/FieldAdder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodAddAdapter.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodAddAdapter.java index 2e490964d1c..7f772e0fa03 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodAddAdapter.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodAddAdapter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java index 7afd1a5d848..c5dc511a87e 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_AddPrintOut.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java index 35eeeae96b9..11a54ec6e54 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_CallNewMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; import jdk.internal.org.objectweb.asm.Label; diff --git a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java index 64b71b845f2..482780c9677 100644 --- a/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java +++ b/test/functional/JavaAgentTest/src_java8/org/openj9/test/javaagenttest/util/MethodInstrumentAdapter_InitializeNewStatic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.javaagenttest.util; import jdk.internal.org.objectweb.asm.Label; diff --git a/test/functional/JavaAgentTest/testng.xml b/test/functional/JavaAgentTest/testng.xml index 9b03aa65796..fd73fc89537 100644 --- a/test/functional/JavaAgentTest/testng.xml +++ b/test/functional/JavaAgentTest/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/BootstrapClassLookup.java b/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/BootstrapClassLookup.java index d99f62fb8c2..16795bf6bf8 100644 --- a/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/BootstrapClassLookup.java +++ b/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/BootstrapClassLookup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.bootstrap; diff --git a/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/Invoker.java b/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/Invoker.java index ce16bf0a1e7..895a65a843a 100644 --- a/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/Invoker.java +++ b/test/functional/Jsr292/bootstrap_src/com/ibm/j9/jsr292/bootstrap/Invoker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.bootstrap; diff --git a/test/functional/Jsr292/bootstrap_src_80/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java b/test/functional/Jsr292/bootstrap_src_80/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java index 87a5f9c5990..8676e205999 100644 --- a/test/functional/Jsr292/bootstrap_src_80/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java +++ b/test/functional/Jsr292/bootstrap_src_80/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.bootstrap; diff --git a/test/functional/Jsr292/bootstrap_src_90/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java b/test/functional/Jsr292/bootstrap_src_90/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java index 70cc5a28b9e..fcfd41027c7 100644 --- a/test/functional/Jsr292/bootstrap_src_90/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java +++ b/test/functional/Jsr292/bootstrap_src_90/com/ibm/j9/jsr292/bootstrap/CallerSensitiveClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.bootstrap; diff --git a/test/functional/Jsr292/build.xml b/test/functional/Jsr292/build.xml index 7fc0436670f..3a9055dfe80 100644 --- a/test/functional/Jsr292/build.xml +++ b/test/functional/Jsr292/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr292/playlist.xml b/test/functional/Jsr292/playlist.xml index db271527ef2..d91a07121a3 100644 --- a/test/functional/Jsr292/playlist.xml +++ b/test/functional/Jsr292/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> variables.mk diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/AdaptorTests.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/AdaptorTests.java index 0c362a2f28c..8f26eaa3d0b 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/AdaptorTests.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/AdaptorTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import org.testng.annotations.Test; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/AsTypeTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/AsTypeTest.java index 471bb49f2a1..c23e0b71dff 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/AsTypeTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/AsTypeTest.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/BasicStaticGetSetExample.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/BasicStaticGetSetExample.java index c1f306889d8..52428c25db3 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/BasicStaticGetSetExample.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/BasicStaticGetSetExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/Catch.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/Catch.java index bbfc820d347..f40bd7d6eb3 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/Catch.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/Catch.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import org.testng.annotations.Test; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ChildCustomClassLoader.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ChildCustomClassLoader.java index 8cd810ee5e8..a662fe86f2b 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ChildCustomClassLoader.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ChildCustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstantCallSiteTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstantCallSiteTest.java index 63743a80491..ef6c1cdbeb0 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstantCallSiteTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstantCallSiteTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstructorHandleTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstructorHandleTest.java index c7d68466275..37b35317d19 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstructorHandleTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ConstructorHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/Crash.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/Crash.java index c1460f05eb5..2af9ad030e0 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/Crash.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/Crash.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/CrossPackageExampleSubclass.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/CrossPackageExampleSubclass.java index 7f38f359ccf..8c1565d52b0 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/CrossPackageExampleSubclass.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/CrossPackageExampleSubclass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass1.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass1.java index 6e18832096a..4252fa59650 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass1.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass2.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass2.java index eae344c90fc..87b60ca93a4 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass2.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/CustomLoadedClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/DirectHandleTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/DirectHandleTest.java index bb8257bdd67..f8e2e0c3d34 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/DirectHandleTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/DirectHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsTest.java index fad5c3bccce..1bc6dc5e363 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsWithCombinerTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsWithCombinerTest.java index 53d041de187..a9389b66072 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsWithCombinerTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/FilterArgumentsWithCombinerTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/FoldArgumentsTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/FoldArgumentsTest.java index 60ed07eb174..bd2ee3a3458 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/FoldArgumentsTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/FoldArgumentsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/GuardTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/GuardTest.java index 130f84133d1..c23f6ff82cb 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/GuardTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/GuardTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ICustomLoadedClass.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ICustomLoadedClass.java index 9faa04c11ae..9487ea7e5a3 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ICustomLoadedClass.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ICustomLoadedClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/InsertArgumentsTests.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/InsertArgumentsTests.java index 9491aee89dd..6a331703033 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/InsertArgumentsTests.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/InsertArgumentsTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/InterfaceHandleTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/InterfaceHandleTest.java index 7a41095732e..745d181b40f 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/InterfaceHandleTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/InterfaceHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292TestSuite.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292TestSuite.java index 39981066f85..ed003067763 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292TestSuite.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292TestSuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292_MultiThreadedTests.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292_MultiThreadedTests.java index 789c697837c..8b5dc966438 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292_MultiThreadedTests.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/JSR292_MultiThreadedTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/JittingDetector.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/JittingDetector.java index 4ac605cd705..da07a3f2c8e 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/JittingDetector.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/JittingDetector.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_AccessClass.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_AccessClass.java index 8698a84822e..0b06c88b8ec 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_AccessClass.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_AccessClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Bind.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Bind.java index e67f998fa29..7a36fa4db71 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Bind.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Bind.java @@ -31,7 +31,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class LookupAPITests_Bind { diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Find.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Find.java index c33f2894f58..481713d5629 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Find.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Find.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_FindClass.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_FindClass.java index 7de47b0fa27..845ba97b5a7 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_FindClass.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_FindClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Unreflect.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Unreflect.java index f1816e6f46f..fb6867073f6 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Unreflect.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupAPITests_Unreflect.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupInTests.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupInTests.java index 4944909b513..9f04fc92bd8 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupInTests.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/LookupInTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import org.testng.annotations.Test; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild1.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild1.java index 60cc67d49ce..aea62e1ebbf 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild1.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import java.lang.invoke.MethodHandle; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild2.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild2.java index c11e60b1e0b..0d7443bfcb3 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild2.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MCSChild2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import java.lang.invoke.MethodHandle; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleInvokeWithArgumentsJumboTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleInvokeWithArgumentsJumboTest.java index 25e71dd6a12..492f08fc43d 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleInvokeWithArgumentsJumboTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleInvokeWithArgumentsJumboTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleProxiesTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleProxiesTest.java index 98fd151f107..083a7c8e1e8 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleProxiesTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleProxiesTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleTest.java index b112b02059c..1abd24bdfd4 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests.java index f921f04da59..c393b4b3a9b 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests_SM.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests_SM.java index cc473241abd..c1e27ece14d 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests_SM.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests_SM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MutableCallSiteTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MutableCallSiteTest.java index 15f52ba68f9..2b80ff6c870 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/MutableCallSiteTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/MutableCallSiteTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ParentCustomClassLoader.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ParentCustomClassLoader.java index 6b35c0fb55b..266cbedb847 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ParentCustomClassLoader.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ParentCustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/PermuteTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/PermuteTest.java index 8531cf91791..0385b6e316c 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/PermuteTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/PermuteTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import org.testng.annotations.Test; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/PrivateMethod.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/PrivateMethod.java index ff20809b010..98e5104d356 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/PrivateMethod.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/PrivateMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; import static java.lang.invoke.MethodHandles.*; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ReceiverBoundHandleTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ReceiverBoundHandleTest.java index a8648275c0f..92001b41bcb 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/ReceiverBoundHandleTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/ReceiverBoundHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/RestrictReceiverTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/RestrictReceiverTest.java index 9d04749bc55..7e4a6a4c39d 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/RestrictReceiverTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/RestrictReceiverTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample.java index 0afc6484749..446c5ded5c1 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample2.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample2.java index 190bbba886a..2483a5acbd7 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample2.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExample2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExampleSubclass.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExampleSubclass.java index daf000f4848..be2b710cad6 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExampleSubclass.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageExampleSubclass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageSingleMethodInterfaceExample.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageSingleMethodInterfaceExample.java index 3faeb6bdffb..e0f78cba311 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageSingleMethodInterfaceExample.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SamePackageSingleMethodInterfaceExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SingleMethodInterfaceImpl.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SingleMethodInterfaceImpl.java index 105dd0af2b2..977338d15ba 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SingleMethodInterfaceImpl.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SingleMethodInterfaceImpl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SwitchPointTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SwitchPointTest.java index 721b9604a33..cb3ff47f8aa 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/SwitchPointTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/SwitchPointTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterface.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterface.java index 701b5da2837..8424422bad0 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterface.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterfaceWithDefaultMethod.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterfaceWithDefaultMethod.java index 45c79232684..9e997daf333 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterfaceWithDefaultMethod.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/TestInterfaceWithDefaultMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/VirtualHandleTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/VirtualHandleTest.java index b855dfc429c..3327dd99b41 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/VirtualHandleTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/VirtualHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/VolatileCallSiteTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/VolatileCallSiteTest.java index f3a4742faf3..b9d05eb7037 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/VolatileCallSiteTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/VolatileCallSiteTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayConstructor.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayConstructor.java index fdbbbce3618..6ebd129d9e6 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayConstructor.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayConstructor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayLength.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayLength.java index 9d735bd14f0..748b4014c2f 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayLength.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_arrayLength.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asCollector.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asCollector.java index 019f1d3e95c..5d3707182ae 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asCollector.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asCollector.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asSpreader.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asSpreader.java index 9b0002e1f8e..c324c243060 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asSpreader.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_asSpreader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_countedLoop.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_countedLoop.java index 90d31fb6eeb..df4e4797f71 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_countedLoop.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_countedLoop.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropArgumentsToMatch.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropArgumentsToMatch.java index d0bb9d0564d..39ada2517b7 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropArgumentsToMatch.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropArgumentsToMatch.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropLookupMode.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropLookupMode.java index 6ce423f8463..08cfcae2460 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropLookupMode.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_dropLookupMode.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_foldArguments.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_foldArguments.java index b1a22482cad..852b534c740 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_foldArguments.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_foldArguments.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_iteratedLoop.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_iteratedLoop.java index 62e3b4d6200..53925030eda 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_iteratedLoop.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_iteratedLoop.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_loop.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_loop.java index 378a76d0c13..67ae2b2a5ac 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_loop.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_loop.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_tryFinally.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_tryFinally.java index f0579f3c982..be1fbe31ee2 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_tryFinally.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_tryFinally.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_whileLoop.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_whileLoop.java index 4e922542458..021cd8feba2 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_whileLoop.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_whileLoop.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_withVarargs.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_withVarargs.java index a930f024cfa..da5d5f69328 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_withVarargs.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_withVarargs.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_zero.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_zero.java index 55fdbe7f407..01872563490 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_zero.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/MethodHandleAPI_zero.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/SamePackageExample.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/SamePackageExample.java index 300f8222cce..4153a7ab6e6 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/SamePackageExample.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/api/SamePackageExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.api; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/bootstrap/Test_CallerSensitive.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/bootstrap/Test_CallerSensitive.java index 460b1f3faaa..77ea3a743ed 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/bootstrap/Test_CallerSensitive.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/bootstrap/Test_CallerSensitive.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.bootstrap; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/helpers/Helper_LookupAPI_OtherPackage.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/helpers/Helper_LookupAPI_OtherPackage.java index 215764db782..8cd8f2d7e4d 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/helpers/Helper_LookupAPI_OtherPackage.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/helpers/Helper_LookupAPI_OtherPackage.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.helpers; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/BootstrapMethods.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/BootstrapMethods.java index d954c274371..340da097f38 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/BootstrapMethods.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/BootstrapMethods.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyGenerator.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyGenerator.java index c4922cb7874..e8b7441b346 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyGenerator.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyTest.java index fbcf35ce878..b6ba7b305ce 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/ComplexIndyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/Helper.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/Helper.java index ed13694ef56..438588a9e83 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/Helper.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/Helper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/IndyTest.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/IndyTest.java index 96ba32a1d59..e2350f90eb1 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/IndyTest.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/IndyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; diff --git a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/SimpleIndyGenerator.java b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/SimpleIndyGenerator.java index 0284e65bfaa..1634b4da071 100644 --- a/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/SimpleIndyGenerator.java +++ b/test/functional/Jsr292/src/com/ibm/j9/jsr292/indyn/SimpleIndyGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; diff --git a/test/functional/Jsr292/src/differentpackage/CrossPackageHelper.java b/test/functional/Jsr292/src/differentpackage/CrossPackageHelper.java index 3262d991c26..4ccf0b56287 100644 --- a/test/functional/Jsr292/src/differentpackage/CrossPackageHelper.java +++ b/test/functional/Jsr292/src/differentpackage/CrossPackageHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package differentpackage; diff --git a/test/functional/Jsr292/src/examples/A.java b/test/functional/Jsr292/src/examples/A.java index 3876e674159..987bbd64ea1 100644 --- a/test/functional/Jsr292/src/examples/A.java +++ b/test/functional/Jsr292/src/examples/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package examples; diff --git a/test/functional/Jsr292/src/examples/CrossPackageDefaultMethodInterface.java b/test/functional/Jsr292/src/examples/CrossPackageDefaultMethodInterface.java index 4369c01a0b2..3a1c41d6bb0 100644 --- a/test/functional/Jsr292/src/examples/CrossPackageDefaultMethodInterface.java +++ b/test/functional/Jsr292/src/examples/CrossPackageDefaultMethodInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package examples; diff --git a/test/functional/Jsr292/src/examples/CrossPackageSingleMethodInterfaceExample.java b/test/functional/Jsr292/src/examples/CrossPackageSingleMethodInterfaceExample.java index f28df3e44ae..1a556ad32ea 100644 --- a/test/functional/Jsr292/src/examples/CrossPackageSingleMethodInterfaceExample.java +++ b/test/functional/Jsr292/src/examples/CrossPackageSingleMethodInterfaceExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package examples; diff --git a/test/functional/Jsr292/src/examples/PackageExamples.java b/test/functional/Jsr292/src/examples/PackageExamples.java index 1dd9baa79b7..4260a54d1db 100644 --- a/test/functional/Jsr292/src/examples/PackageExamples.java +++ b/test/functional/Jsr292/src/examples/PackageExamples.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package examples; diff --git a/test/functional/Jsr292/testng.xml b/test/functional/Jsr292/testng.xml index 79f9365a128..f886a1f4bbc 100644 --- a/test/functional/Jsr292/testng.xml +++ b/test/functional/Jsr292/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr292/testng_8.xml b/test/functional/Jsr292/testng_8.xml index 9a60629e717..f066420838e 100644 --- a/test/functional/Jsr292/testng_8.xml +++ b/test/functional/Jsr292/testng_8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr292/testng_sm.xml b/test/functional/Jsr292/testng_sm.xml index aa3b94dbd6a..60b9b9566cb 100644 --- a/test/functional/Jsr292/testng_sm.xml +++ b/test/functional/Jsr292/testng_sm.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr335/build.xml b/test/functional/Jsr335/build.xml index 53d67917e52..bd7d6a7b168 100644 --- a/test/functional/Jsr335/build.xml +++ b/test/functional/Jsr335/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr335/playlist.xml b/test/functional/Jsr335/playlist.xml index 283adf0718c..7d622da6e83 100644 --- a/test/functional/Jsr335/playlist.xml +++ b/test/functional/Jsr335/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/ASMInterfaceEarlyInit.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/ASMInterfaceEarlyInit.java index 21572f6dbd5..417f5e49506 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/ASMInterfaceEarlyInit.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/ASMInterfaceEarlyInit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderInterface.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderInterface.java index f056c887121..bacdbd4d453 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderInterface.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderSubInterface.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderSubInterface.java index b82ca161af6..d733badaa10 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderSubInterface.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/DefenderSubInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestClinitLambda.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestClinitLambda.java index 10c7edde63a..40342793692 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestClinitLambda.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestClinitLambda.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderMethodLookup.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderMethodLookup.java index e6ce9123925..79f9a411c08 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderMethodLookup.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderMethodLookup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderResolution.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderResolution.java index 4830dc1bd7c..306d606936a 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderResolution.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestDefenderResolution.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestInterfaceEarlyInit.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestInterfaceEarlyInit.java index e400b7ad69d..14f09bccafd 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestInterfaceEarlyInit.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestInterfaceEarlyInit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambda.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambda.java index 42f99552cbe..72501041544 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambda.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambda.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambdaAccessibilityRules.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambdaAccessibilityRules.java index d6a9ed7e36d..b732cdbb2cf 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambdaAccessibilityRules.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestLambdaAccessibilityRules.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodHandleInfo.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodHandleInfo.java index ad9960d7115..4f75e53c241 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodHandleInfo.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodHandleInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ //package java.lang.invoke; package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodReferences.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodReferences.java index b4f46484066..86f3cefe23b 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodReferences.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestMethodReferences.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestSerializable.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestSerializable.java index 110b1a4c851..f36f0cfebb2 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/TestSerializable.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/TestSerializable.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/TestDefenderSupersends.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/TestDefenderSupersends.java index dd2695d0979..09db031dda9 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/TestDefenderSupersends.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/TestDefenderSupersends.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmGenerator.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmGenerator.java index 8a6c5399c9e..0465e284cdd 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmGenerator.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends.asm; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmLoader.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmLoader.java index c7ce0a4b4d2..ae0e49ef3de 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmLoader.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends.asm; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmTestcaseGenerator.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmTestcaseGenerator.java index c28a4b9dbed..baf9cca5e9a 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmTestcaseGenerator.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmTestcaseGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends.asm; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmUtils.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmUtils.java index 7d4238b3df5..dc774d8bcd0 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmUtils.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/AsmUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends.asm; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestDefenderMethodLookupAsm.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestDefenderMethodLookupAsm.java index b6282e29935..f21aa16f3de 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestDefenderMethodLookupAsm.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestDefenderMethodLookupAsm.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends.asm; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestHarness.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestHarness.java index 32a2d93d7da..56572f0ba3e 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestHarness.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defendersupersends/asm/TestHarness.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defendersupersends.asm; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/AnonClass.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/AnonClass.java index 0c5c80548c7..c64dc361dcd 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/AnonClass.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/AnonClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defineAnonClass; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/BasicClass.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/BasicClass.java index 90f02bd1ab7..23cb86d1826 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/BasicClass.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/BasicClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defineAnonClass; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/CircularBuffer.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/CircularBuffer.java index ebe3ab0def9..28d35118d73 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/CircularBuffer.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/CircularBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defineAnonClass; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/TestUnsafeDefineAnonClass.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/TestUnsafeDefineAnonClass.java index a12acf9918b..f99009d351a 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/TestUnsafeDefineAnonClass.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/defineAnonClass/TestUnsafeDefineAnonClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.defineAnonClass; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/I.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/I.java index 77e15d0e133..11cb9e37047 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/I.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/I.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaces; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/J.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/J.java index 121a342adca..1a2c60bfd1b 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/J.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/J.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaces; diff --git a/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/K.java b/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/K.java index ea65127d068..d0171ffc733 100644 --- a/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/K.java +++ b/test/functional/Jsr335/src/org/openj9/test/jsr335/interfaces/K.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaces; diff --git a/test/functional/Jsr335/testng.xml b/test/functional/Jsr335/testng.xml index ebd3d6815b2..e613d2636d1 100644 --- a/test/functional/Jsr335/testng.xml +++ b/test/functional/Jsr335/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr335_interfaceStaticMethod/build.xml b/test/functional/Jsr335_interfaceStaticMethod/build.xml index 6734f4ef9d9..d11ddafacfe 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/build.xml +++ b/test/functional/Jsr335_interfaceStaticMethod/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr335_interfaceStaticMethod/playlist.xml b/test/functional/Jsr335_interfaceStaticMethod/playlist.xml index e76697ffee6..8333257f8a7 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/playlist.xml +++ b/test/functional/Jsr335_interfaceStaticMethod/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/A.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/A.java index e79dc973cac..23c5ef5585b 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/A.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaceStaticMethod; diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/B.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/B.java index 9c897d03c51..51f0e26a273 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/B.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaceStaticMethod; diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/C.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/C.java index 45ca73dd0ea..05768df9051 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/C.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaceStaticMethod; diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/InvokeStaticTest.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/InvokeStaticTest.java index 7faec47d0f3..ee32a7d4bf6 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/InvokeStaticTest.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/InvokeStaticTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/MethodHandleInvokeStaticTest.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/MethodHandleInvokeStaticTest.java index 87cd1805162..00df0432009 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/MethodHandleInvokeStaticTest.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/MethodHandleInvokeStaticTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/ReflectStaticTest.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/ReflectStaticTest.java index 8504e8fb88a..0d685969f7a 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/ReflectStaticTest.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/ReflectStaticTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.jsr335.interfaceStaticMethod; diff --git a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/SimpleInvokeStaticGenerator.java b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/SimpleInvokeStaticGenerator.java index a2a9e1305cd..08cbbec76af 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/SimpleInvokeStaticGenerator.java +++ b/test/functional/Jsr335_interfaceStaticMethod/src/org/openj9/test/jsr335/interfaceStaticMethod/SimpleInvokeStaticGenerator.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_STATIC; diff --git a/test/functional/Jsr335_interfaceStaticMethod/testng.xml b/test/functional/Jsr335_interfaceStaticMethod/testng.xml index 70df19d75c2..1ed2956d066 100644 --- a/test/functional/Jsr335_interfaceStaticMethod/testng.xml +++ b/test/functional/Jsr335_interfaceStaticMethod/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/NativeTest/algotest/avltest.lst b/test/functional/NativeTest/algotest/avltest.lst index ab85532f4a7..ea4db3801b4 100644 --- a/test/functional/NativeTest/algotest/avltest.lst +++ b/test/functional/NativeTest/algotest/avltest.lst @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # format: diff --git a/test/functional/NativeTest/build.xml b/test/functional/NativeTest/build.xml index 636ef8597c9..9d1a4789df5 100644 --- a/test/functional/NativeTest/build.xml +++ b/test/functional/NativeTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/NativeTest/jniargtests/JniArgTests.java b/test/functional/NativeTest/jniargtests/JniArgTests.java index 571be9c553b..dccc37d73c4 100644 --- a/test/functional/NativeTest/jniargtests/JniArgTests.java +++ b/test/functional/NativeTest/jniargtests/JniArgTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class JniArgTests { diff --git a/test/functional/NativeTest/jniargtests/build.xml b/test/functional/NativeTest/jniargtests/build.xml index 15ca147baac..afce023712b 100644 --- a/test/functional/NativeTest/jniargtests/build.xml +++ b/test/functional/NativeTest/jniargtests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/NativeTest/playlist.xml b/test/functional/NativeTest/playlist.xml index 843acb9f0f3..7a74515cb98 100644 --- a/test/functional/NativeTest/playlist.xml +++ b/test/functional/NativeTest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> nativeTestSettings.mk diff --git a/test/functional/OpenJ9_Jsr_292_API/build.xml b/test/functional/OpenJ9_Jsr_292_API/build.xml index 3b2a93ae6fa..d8d6919e184 100644 --- a/test/functional/OpenJ9_Jsr_292_API/build.xml +++ b/test/functional/OpenJ9_Jsr_292_API/build.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/AnotherModuleExample.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/AnotherModuleExample.java index c933c268942..abda7623cf8 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/AnotherModuleExample.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/AnotherModuleExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package mods.modulea.package1; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/ModuleExample.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/ModuleExample.java index 3c5596e40f6..52718d8bcac 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/ModuleExample.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package1/ModuleExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package mods.modulea.package1; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package2/SameModuleExample.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package2/SameModuleExample.java index 74ffe765ec8..3a8bc9c64ea 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package2/SameModuleExample.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/mods/modulea/package2/SameModuleExample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package mods.modulea.package2; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/module-info.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/module-info.java index 870b26a7b23..2fb9ef87859 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/module-info.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulea/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module mods.modulea { requires mods.moduleb; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/mods/moduleb/package1/DifferentModuleExample1.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/mods/moduleb/package1/DifferentModuleExample1.java index 37670591884..b2f30100daa 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/mods/moduleb/package1/DifferentModuleExample1.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/mods/moduleb/package1/DifferentModuleExample1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package mods.moduleb.package1; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/module-info.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/module-info.java index 4c87164d1f0..dd70836f594 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/module-info.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.moduleb/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module mods.moduleb { exports mods.moduleb.package1; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/mods/modulec/package1/DifferentModuleExample2.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/mods/modulec/package1/DifferentModuleExample2.java index 076fecf6985..cc4b8ff0c21 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/mods/modulec/package1/DifferentModuleExample2.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/mods/modulec/package1/DifferentModuleExample2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package mods.modulec.package1; diff --git a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/module-info.java b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/module-info.java index 68e510c1995..60d65c70618 100644 --- a/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/module-info.java +++ b/test/functional/OpenJ9_Jsr_292_API/modules/mods.modulec/module-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ module mods.modulec { exports mods.modulec.package1; diff --git a/test/functional/OpenJ9_Jsr_292_API/playlist.xml b/test/functional/OpenJ9_Jsr_292_API/playlist.xml index 44b75fd7351..21272a9e970 100644 --- a/test/functional/OpenJ9_Jsr_292_API/playlist.xml +++ b/test/functional/OpenJ9_Jsr_292_API/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Panama/README.md b/test/functional/Panama/README.md index 106ef5d8740..e51eba14f7f 100644 --- a/test/functional/Panama/README.md +++ b/test/functional/Panama/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Panama Test diff --git a/test/functional/Panama/build.xml b/test/functional/Panama/build.xml index 36e3d58aff7..2be2aff2320 100644 --- a/test/functional/Panama/build.xml +++ b/test/functional/Panama/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Panama/panamatest.c b/test/functional/Panama/panamatest.c index 23d06c71f98..31a531edf12 100644 --- a/test/functional/Panama/panamatest.c +++ b/test/functional/Panama/panamatest.c @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/Panama/playlist.xml b/test/functional/Panama/playlist.xml index c1f4a5955b4..bd3e0846cd3 100644 --- a/test/functional/Panama/playlist.xml +++ b/test/functional/Panama/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Panama/src/org/openj9/test/panama/CustomFFINativeMethodHandleTest.java b/test/functional/Panama/src/org/openj9/test/panama/CustomFFINativeMethodHandleTest.java index 4a10c808c62..1f5e9af95a4 100644 --- a/test/functional/Panama/src/org/openj9/test/panama/CustomFFINativeMethodHandleTest.java +++ b/test/functional/Panama/src/org/openj9/test/panama/CustomFFINativeMethodHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.panama; diff --git a/test/functional/Panama/src/org/openj9/test/panama/HigherLevelNativeMethodHandleTest.java b/test/functional/Panama/src/org/openj9/test/panama/HigherLevelNativeMethodHandleTest.java index 8c59579ef22..00da14d296b 100644 --- a/test/functional/Panama/src/org/openj9/test/panama/HigherLevelNativeMethodHandleTest.java +++ b/test/functional/Panama/src/org/openj9/test/panama/HigherLevelNativeMethodHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.panama; diff --git a/test/functional/Panama/src/org/openj9/test/panama/NativeMethodHandleTest.java b/test/functional/Panama/src/org/openj9/test/panama/NativeMethodHandleTest.java index b2776819a3b..317036cefcf 100644 --- a/test/functional/Panama/src/org/openj9/test/panama/NativeMethodHandleTest.java +++ b/test/functional/Panama/src/org/openj9/test/panama/NativeMethodHandleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.panama; diff --git a/test/functional/Panama/testng.xml b/test/functional/Panama/testng.xml index d7b124000c0..dee57b080cf 100644 --- a/test/functional/Panama/testng.xml +++ b/test/functional/Panama/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/RasapiTest/.gitignore b/test/functional/RasapiTest/.gitignore index 0d604ae13f2..774d75c047e 100644 --- a/test/functional/RasapiTest/.gitignore +++ b/test/functional/RasapiTest/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 /dist /subant1.build diff --git a/test/functional/RasapiTest/build.xml b/test/functional/RasapiTest/build.xml index e4decbbcaf5..aedd1fa049e 100644 --- a/test/functional/RasapiTest/build.xml +++ b/test/functional/RasapiTest/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Dump.java b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Dump.java index 9456450375c..11e506be2a0 100644 --- a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Dump.java +++ b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Dump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpConfigurationUnavailableException.java b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpConfigurationUnavailableException.java index 0992eb9d2a5..058f977ae28 100644 --- a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpConfigurationUnavailableException.java +++ b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpConfigurationUnavailableException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpPermission.java b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpPermission.java index 321bb228a0c..3ba2b020fbd 100644 --- a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpPermission.java +++ b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/DumpPermission.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/InvalidDumpOptionException.java b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/InvalidDumpOptionException.java index d25bf17a445..ccd402ee5ff 100644 --- a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/InvalidDumpOptionException.java +++ b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/InvalidDumpOptionException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Log.java b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Log.java index 2bd013117d1..0860734af99 100644 --- a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Log.java +++ b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/Log.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/ToolDumpPermission.java b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/ToolDumpPermission.java index 30b0b695fab..87c5295657c 100644 --- a/test/functional/RasapiTest/dummy_src/com/ibm/jvm/ToolDumpPermission.java +++ b/test/functional/RasapiTest/dummy_src/com/ibm/jvm/ToolDumpPermission.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm; diff --git a/test/functional/RasapiTest/playlist.xml b/test/functional/RasapiTest/playlist.xml index c3b396e4986..28161b99ea7 100644 --- a/test/functional/RasapiTest/playlist.xml +++ b/test/functional/RasapiTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/OutputFile.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/OutputFile.java index d0d89a9b6ba..28b515b35a3 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/OutputFile.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/OutputFile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/StringUtils.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/StringUtils.java index 83dcd525664..db397357fc4 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/StringUtils.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/StringUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/CheckClassicHeapdump.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/CheckClassicHeapdump.java index ddffd857abd..17c25eb3d49 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/CheckClassicHeapdump.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/CheckClassicHeapdump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest1PackedPrimitivesChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest1PackedPrimitivesChecker.java index 9ff341922fc..e7c9c09ce7c 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest1PackedPrimitivesChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest1PackedPrimitivesChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest2ArrayOfPackedPrimitivesChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest2ArrayOfPackedPrimitivesChecker.java index b55f82c0095..73afcbba92e 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest2ArrayOfPackedPrimitivesChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest2ArrayOfPackedPrimitivesChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest3PackedMixedOneRefChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest3PackedMixedOneRefChecker.java index 488ad48ac65..f327139c2e6 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest3PackedMixedOneRefChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest3PackedMixedOneRefChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java index 49dd3520fc7..e36742c3deb 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java index f5a3c7e8ca2..b3a674c9346 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java index 952e960c6eb..513dfc907aa 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest7NestedPackedChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest7NestedPackedChecker.java index 7fb1e9fc446..dd13f2621a6 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest7NestedPackedChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest7NestedPackedChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest8PackedIntsArrayChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest8PackedIntsArrayChecker.java index 12ece3a94ad..0935f51ce17 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest8PackedIntsArrayChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest8PackedIntsArrayChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java index adae8a31fba..de82cd20fe1 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/classic_heapdump_packed_objects/ClassicHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.classic_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CheckCommandOutput.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CheckCommandOutput.java index 7ee79d452bc..26ac64b06d9 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CheckCommandOutput.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CheckCommandOutput.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.commands; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ContainingString.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ContainingString.java index 57056516cd8..fcff943c40a 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ContainingString.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ContainingString.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.commands; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingChars.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingChars.java index 69cf07d3211..ea07d865734 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingChars.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingChars.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.commands; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingLines.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingLines.java index 4033ee29cc3..aeeca613f45 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingLines.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/CountingLines.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.commands; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ICommandOutputChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ICommandOutputChecker.java index 0d00a98aa4b..f92275c761e 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ICommandOutputChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/ICommandOutputChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.commands; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/StringUtils.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/StringUtils.java index 768a238bdb9..f5b68de282a 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/StringUtils.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/commands/StringUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.commands; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/excessive_gc/HeapAllocation.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/excessive_gc/HeapAllocation.java index c1340f3d400..006f21bfdfd 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/excessive_gc/HeapAllocation.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/excessive_gc/HeapAllocation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.excessive_gc; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJavaCore.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJavaCore.java index 9321c5ff7cb..ac2ea52aa4d 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJavaCore.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJavaCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_deadlock; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJdmpviewDeadlock.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJdmpviewDeadlock.java index b686cdd07e0..2002e3683c4 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJdmpviewDeadlock.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CheckJdmpviewDeadlock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_deadlock; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CreateJavaCore.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CreateJavaCore.java index 5b8c1e2cc63..0b386c835b6 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CreateJavaCore.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/CreateJavaCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_deadlock; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/Deadlock.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/Deadlock.java index 69390c40ffd..8b79494893f 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/Deadlock.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/Deadlock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/package com.ibm.dump.tests.javacore_deadlock; import java.lang.Thread.State; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/DeadlockCreator.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/DeadlockCreator.java index 2fb496ae249..880f8a0a34d 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/DeadlockCreator.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/DeadlockCreator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_deadlock; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/JUCDeadlock.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/JUCDeadlock.java index e06350b346e..d7cab931b45 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/JUCDeadlock.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/JUCDeadlock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_deadlock; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/MixedDeadlock.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/MixedDeadlock.java index 14a0a0df0c7..cccfab7d950 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/MixedDeadlock.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_deadlock/MixedDeadlock.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_deadlock; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CheckJavaCore.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CheckJavaCore.java index f4883ff47c5..e7109152e33 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CheckJavaCore.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CheckJavaCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CreateJavaCore.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CreateJavaCore.java index 586123fb683..40c9e32deed 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CreateJavaCore.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/CreateJavaCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInSequence.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInSequence.java index 4ec09e187d3..ed7fa75d9bf 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInSequence.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInSequence.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInStack.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInStack.java index f9ce79b4d13..f39447ada50 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInStack.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterInStack.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterTwice.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterTwice.java index f90ec8577f2..0cd2fb39a02 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterTwice.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EnterTwice.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EntryRecord.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EntryRecord.java index 6884ecf63e5..bac30174128 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EntryRecord.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/EntryRecord.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/SimpleEnter.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/SimpleEnter.java index 93b755d4cc9..f3b3083cf6b 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/SimpleEnter.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/SimpleEnter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/StackCreator.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/StackCreator.java index a8fbb7fb4ea..d7be9fd16a2 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/StackCreator.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_lock_context/StackCreator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_lock_context; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_meminfo/ValidateMemInfo.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_meminfo/ValidateMemInfo.java index 6528270f227..d1c8d51ed69 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_meminfo/ValidateMemInfo.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_meminfo/ValidateMemInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_meminfo; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJavaCore.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJavaCore.java index 348d1a41854..6f006fa5bc5 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJavaCore.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJavaCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_thread; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJdmpviewInfoThread.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJdmpviewInfoThread.java index a4858623950..b24453c15f6 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJdmpviewInfoThread.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CheckJdmpviewInfoThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_thread; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CoreThreadCreator.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CoreThreadCreator.java index 42a909c627d..7a7ba79ee6a 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CoreThreadCreator.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CoreThreadCreator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_thread; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CreateJavaCore.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CreateJavaCore.java index 2dfe868c1d6..ff4ad3c0836 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CreateJavaCore.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/CreateJavaCore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_thread; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/FIFOMutex.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/FIFOMutex.java index ea3e0f12757..979b10a0e72 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/FIFOMutex.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/FIFOMutex.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_thread; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/OwnableFIFOMutex.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/OwnableFIFOMutex.java index 7beaa277fc7..b88a921ef15 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/OwnableFIFOMutex.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/javacore_thread/OwnableFIFOMutex.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.javacore_thread; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CompareDumps.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CompareDumps.java index 7467d73afc9..973185badd3 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CompareDumps.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CompareDumps.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.jdmpview_heapdump; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CreateDumps.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CreateDumps.java index c045a61b218..bdb24dc6f1c 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CreateDumps.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/jdmpview_heapdump/CreateDumps.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.jdmpview_heapdump; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/DTFJMemoryCategoryTest.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/DTFJMemoryCategoryTest.java index 111ee6b1eb8..fd2c33cf171 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/DTFJMemoryCategoryTest.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/DTFJMemoryCategoryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.memorycategories; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/ValidateMemoryCategories.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/ValidateMemoryCategories.java index 64b60e30b3c..d4c7be8a107 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/ValidateMemoryCategories.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/memorycategories/ValidateMemoryCategories.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.memorycategories; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/oomtest/OOMTest.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/oomtest/OOMTest.java index 2df0afa55ba..d8b3c6efe16 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/oomtest/OOMTest.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/oomtest/OOMTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.oomtest; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/CheckPortableHeapdump.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/CheckPortableHeapdump.java index 6959a19b75c..504cf8401a9 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/CheckPortableHeapdump.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/CheckPortableHeapdump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest1PackedPrimitivesChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest1PackedPrimitivesChecker.java index 1eb6ce22066..1acc084aeb5 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest1PackedPrimitivesChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest1PackedPrimitivesChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest2ArrayOfPackedPrimitivesChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest2ArrayOfPackedPrimitivesChecker.java index bf84aa603e3..21636da6c12 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest2ArrayOfPackedPrimitivesChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest2ArrayOfPackedPrimitivesChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest3PackedMixedChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest3PackedMixedChecker.java index 6a0af3c10f0..7e95ddb1dcb 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest3PackedMixedChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest3PackedMixedChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java index aacad660ca3..79b613518da 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest4ArrayOfPackedMixedOneRefChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java index 783f7a143f2..c737fc063df 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest5ArrayOfPackedMixedTwoRefsChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java index 8e07ff3bb41..5f65652c34a 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest6PackedMixedWithReferenceToSelfChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest7NestedPackedChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest7NestedPackedChecker.java index 90bb59801b6..2f514d3f903 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest7NestedPackedChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest7NestedPackedChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest8PackedIntsArrayChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest8PackedIntsArrayChecker.java index ef7aa9a41f7..f01c7a648d0 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest8PackedIntsArrayChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest8PackedIntsArrayChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java index f6fef81cb96..4c1bb49d362 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/portable_heapdump_packed_objects/PortableHeapdumpTest9ArrayOfPackedMixedArrayElementChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.portable_heapdump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/CheckSystemDump.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/CheckSystemDump.java index c8f632d506e..5501c9fea01 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/CheckSystemDump.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/CheckSystemDump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest101DerivedPackedIntsArrayArrayChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest101DerivedPackedIntsArrayArrayChecker.java index 32e567e6b8b..8f11bc2baca 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest101DerivedPackedIntsArrayArrayChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest101DerivedPackedIntsArrayArrayChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest10PackedIntsArrayArrayChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest10PackedIntsArrayArrayChecker.java index 9e2475e9e42..10c2174ca4f 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest10PackedIntsArrayArrayChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest10PackedIntsArrayArrayChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest11ArrayOfPackedMixedArrayElementChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest11ArrayOfPackedMixedArrayElementChecker.java index fc223c12a00..8a90cc1b445 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest11ArrayOfPackedMixedArrayElementChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest11ArrayOfPackedMixedArrayElementChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest1PackedPrimitivesChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest1PackedPrimitivesChecker.java index bc196a3203d..8effa93868a 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest1PackedPrimitivesChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest1PackedPrimitivesChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest2ArrayOfPackedPrimitivesChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest2ArrayOfPackedPrimitivesChecker.java index f67bf4ac08b..d74d1e25bf2 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest2ArrayOfPackedPrimitivesChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest2ArrayOfPackedPrimitivesChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest3PackedMixedOneRefChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest3PackedMixedOneRefChecker.java index 8ddfe53e8a5..de292983836 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest3PackedMixedOneRefChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest3PackedMixedOneRefChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest4ArrayOfPackedMixedOneRefChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest4ArrayOfPackedMixedOneRefChecker.java index 2da2c2d1b9d..c211e28fcf4 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest4ArrayOfPackedMixedOneRefChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest4ArrayOfPackedMixedOneRefChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest5ArrayOfPackedMixedTwoRefsChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest5ArrayOfPackedMixedTwoRefsChecker.java index 6fe5993a8b1..1859cb093f6 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest5ArrayOfPackedMixedTwoRefsChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest5ArrayOfPackedMixedTwoRefsChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest6PackedMixedWithReferenceToSelfChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest6PackedMixedWithReferenceToSelfChecker.java index 55f7e6aef95..daeee8b07eb 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest6PackedMixedWithReferenceToSelfChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest6PackedMixedWithReferenceToSelfChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest71NestedPacked1Checker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest71NestedPacked1Checker.java index a12d4e7c330..55648345516 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest71NestedPacked1Checker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest71NestedPacked1Checker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest7NestedPackedChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest7NestedPackedChecker.java index 2708e1e8910..d8291dc1ce3 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest7NestedPackedChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest7NestedPackedChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/package com.ibm.dump.tests.system_dump_packed_objects; import java.io.IOException; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest8NestedPackedMixedChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest8NestedPackedMixedChecker.java index fe1a687ebda..9e78b844a14 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest8NestedPackedMixedChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest8NestedPackedMixedChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest9PackedIntsArrayChecker.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest9PackedIntsArrayChecker.java index fadf77576f3..1271dcb7b4a 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest9PackedIntsArrayChecker.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/system_dump_packed_objects/SystemDumpTest9PackedIntsArrayChecker.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.system_dump_packed_objects; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/CreateDump.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/CreateDump.java index 0e9259c531a..a2c35a8d940 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/CreateDump.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/CreateDump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.timestamp; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/TestException.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/TestException.java index b637aba0914..106e3241bc7 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/TestException.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/timestamp/TestException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.timestamp; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedMixedTwoRefs.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedMixedTwoRefs.java index a13f7aa04b8..c29bd2e950f 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedMixedTwoRefs.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedMixedTwoRefs.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.types.notpacked; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedPrimitives.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedPrimitives.java index 6a358197b76..2b1c18093c6 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedPrimitives.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/types/notpacked/NotPackedPrimitives.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.types.notpacked; diff --git a/test/functional/RasapiTest/src/com/ibm/dump/tests/version_info/CheckVersionString.java b/test/functional/RasapiTest/src/com/ibm/dump/tests/version_info/CheckVersionString.java index 3796b4dd430..2a02878d86d 100644 --- a/test/functional/RasapiTest/src/com/ibm/dump/tests/version_info/CheckVersionString.java +++ b/test/functional/RasapiTest/src/com/ibm/dump/tests/version_info/CheckVersionString.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.dump.tests.version_info; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIBasicTests.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIBasicTests.java index db8f50af85f..5d224de468d 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIBasicTests.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIBasicTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIQuerySetReset.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIQuerySetReset.java index 82e98554038..b33d5f612d9 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIQuerySetReset.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIQuerySetReset.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISecurityTests.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISecurityTests.java index 3a8632b36dd..82abee8c687 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISecurityTests.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISecurityTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISetTestXdumpdynamic.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISetTestXdumpdynamic.java index 53062bf84ca..526d1ea76a1 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISetTestXdumpdynamic.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISetTestXdumpdynamic.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISuite.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISuite.java index 8edfd86be62..39fe6f3285c 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISuite.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPISuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITokensTests.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITokensTests.java index 01e087c96da..b021bd1b9e5 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITokensTests.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITokensTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIToolSecuritySuite.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIToolSecuritySuite.java index 9f69efd40eb..b74dec74e34 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIToolSecuritySuite.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPIToolSecuritySuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITriggerTests.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITriggerTests.java index dead889a4e3..c2ac91b6d44 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITriggerTests.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/DumpAPITriggerTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/LogAPISecurityTests.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/LogAPISecurityTests.java index 759d8485edf..a8e82908174 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/LogAPISecurityTests.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/LogAPISecurityTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/TraceAPISecurityTests.java b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/TraceAPISecurityTests.java index 0dcd48d01dd..ec92fb265fe 100644 --- a/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/TraceAPISecurityTests.java +++ b/test/functional/RasapiTest/src/com/ibm/jvm/ras/tests/TraceAPISecurityTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvm.ras.tests; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/GenerateJavaCoreAndSnap.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/GenerateJavaCoreAndSnap.java index 8916e94c1ac..65f5040304a 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/GenerateJavaCoreAndSnap.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/GenerateJavaCoreAndSnap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; /* diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestGetMicros.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestGetMicros.java index c640735efd5..cceca8a39a5 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestGetMicros.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestGetMicros.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestJavaCoreAndSnap.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestJavaCoreAndSnap.java index aee57cd8349..669f8903d52 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestJavaCoreAndSnap.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestJavaCoreAndSnap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestMultipleApplications.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestMultipleApplications.java index f6acbe3e354..2e22b493387 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestMultipleApplications.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestMultipleApplications.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSnap.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSnap.java index db96a3f821c..1fcba1a4dd9 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSnap.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSnap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResume.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResume.java index de4ca502ddc..9fe7e14ff4f 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResume.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResume.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResumeThis.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResumeThis.java index f79d84aaf30..49c4ca83401 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResumeThis.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestSuspendResumeThis.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceArguments.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceArguments.java index 65d1e4efffe..b2776855d08 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceArguments.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceArguments.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceTypes.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceTypes.java index 85a2be6c8a8..0c673da6aba 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceTypes.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/apptrace/TestTraceTypes.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.apptrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/HelloWorld.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/HelloWorld.java index 3db5755227b..c9ff785ad3d 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/HelloWorld.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/HelloWorld.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.jstacktrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/TriggerDumpTracePoint.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/TriggerDumpTracePoint.java index 91be4732b58..ff73cdeed2e 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/TriggerDumpTracePoint.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/jstacktrace/TriggerDumpTracePoint.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.jstacktrace; diff --git a/test/functional/RasapiTest/src/com/ibm/trace/tests/trace_subscriber/TraceQueue.java b/test/functional/RasapiTest/src/com/ibm/trace/tests/trace_subscriber/TraceQueue.java index f53eb470d27..269584834b3 100644 --- a/test/functional/RasapiTest/src/com/ibm/trace/tests/trace_subscriber/TraceQueue.java +++ b/test/functional/RasapiTest/src/com/ibm/trace/tests/trace_subscriber/TraceQueue.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.trace.tests.trace_subscriber; diff --git a/test/functional/RasapiTest/test.xml b/test/functional/RasapiTest/test.xml index 71772aabd96..ce2e0611f6a 100644 --- a/test/functional/RasapiTest/test.xml +++ b/test/functional/RasapiTest/test.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/SharedCPEntryInvokerTests/build.xml b/test/functional/SharedCPEntryInvokerTests/build.xml index e5f94c97535..f9e3d86aa94 100644 --- a/test/functional/SharedCPEntryInvokerTests/build.xml +++ b/test/functional/SharedCPEntryInvokerTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/SharedCPEntryInvokerTests/playlist.xml b/test/functional/SharedCPEntryInvokerTests/playlist.xml index 1d7c706ef7a..df758abc95c 100644 --- a/test/functional/SharedCPEntryInvokerTests/playlist.xml +++ b/test/functional/SharedCPEntryInvokerTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateOnStackSplitTableRetransformationTest.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateOnStackSplitTableRetransformationTest.java index 309649ed3b0..325d1a4e909 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateOnStackSplitTableRetransformationTest.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateOnStackSplitTableRetransformationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateSplitTableRetransformationTest.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateSplitTableRetransformationTest.java index c853f3a3352..e9838333e53 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateSplitTableRetransformationTest.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/InvalidateSplitTableRetransformationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateOnStackSplitTableRetransformationTest.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateOnStackSplitTableRetransformationTest.java index ed3aae9f574..b3f2f242363 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateOnStackSplitTableRetransformationTest.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateOnStackSplitTableRetransformationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateSplitTableRetransformationTest.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateSplitTableRetransformationTest.java index 60c8cd30e1e..611ecb3ea51 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateSplitTableRetransformationTest.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/MutateSplitTableRetransformationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/SharedCPEntryInvokerTestCases.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/SharedCPEntryInvokerTestCases.java index c975f4538c6..347d895c557 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/SharedCPEntryInvokerTestCases.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/SharedCPEntryInvokerTestCases.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/ClassGenerator.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/ClassGenerator.java index 9ba703e269c..1922319ea73 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/ClassGenerator.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker.util; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/DummyClassGenerator.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/DummyClassGenerator.java index 40a0ca5c456..2689c0f2e2d 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/DummyClassGenerator.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/DummyClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker.util; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/GeneratedClassLoader.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/GeneratedClassLoader.java index 790b1294e36..a2ed1e00418 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/GeneratedClassLoader.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/GeneratedClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker.util; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/HelperClassGenerator.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/HelperClassGenerator.java index a54c34fbe29..90b9751c00b 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/HelperClassGenerator.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/HelperClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker.util; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/InterfaceGenerator.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/InterfaceGenerator.java index 3e17d577ef8..3e32059f6bc 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/InterfaceGenerator.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/InterfaceGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker.util; diff --git a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/MethodType.java b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/MethodType.java index 77750aafd05..c5c275f3900 100644 --- a/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/MethodType.java +++ b/test/functional/SharedCPEntryInvokerTests/src/org/openj9/test/invoker/util/MethodType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.invoker.util; diff --git a/test/functional/SharedCPEntryInvokerTests/testng.xml b/test/functional/SharedCPEntryInvokerTests/testng.xml index 6c28c75beb5..4d26110aa99 100644 --- a/test/functional/SharedCPEntryInvokerTests/testng.xml +++ b/test/functional/SharedCPEntryInvokerTests/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/TestExample/.gitignore b/test/functional/TestExample/.gitignore index f59f9af1d9f..d08935418b2 100644 --- a/test/functional/TestExample/.gitignore +++ b/test/functional/TestExample/.gitignore @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *.class diff --git a/test/functional/TestExample/build.xml b/test/functional/TestExample/build.xml index 67f21daed7e..b8ee9643a6c 100644 --- a/test/functional/TestExample/build.xml +++ b/test/functional/TestExample/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/TestExample/playlist.xml b/test/functional/TestExample/playlist.xml index 39b1e5861d4..4e2ea3f8f79 100644 --- a/test/functional/TestExample/playlist.xml +++ b/test/functional/TestExample/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/TestExample/src/org/openj9/test/example/MyTest.java b/test/functional/TestExample/src/org/openj9/test/example/MyTest.java index 12d83708f1a..e93a5cdfb8e 100644 --- a/test/functional/TestExample/src/org/openj9/test/example/MyTest.java +++ b/test/functional/TestExample/src/org/openj9/test/example/MyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.example; diff --git a/test/functional/TestExample/testng.xml b/test/functional/TestExample/testng.xml index 6d9e61cc024..49c9dfc150e 100644 --- a/test/functional/TestExample/testng.xml +++ b/test/functional/TestExample/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/FileUtilities.java b/test/functional/TestUtilities/src/org/openj9/test/util/FileUtilities.java index e1664316be7..4dfca27001d 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/FileUtilities.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/FileUtilities.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/HelloWorld.java b/test/functional/TestUtilities/src/org/openj9/test/util/HelloWorld.java index d2a9c6f0201..eb14d15af4f 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/HelloWorld.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/HelloWorld.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Trivial test program diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/JavaAgent.java b/test/functional/TestUtilities/src/org/openj9/test/util/JavaAgent.java index 254b4239380..4ff3f12fbf9 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/JavaAgent.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/JavaAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/PlatformInfo.java b/test/functional/TestUtilities/src/org/openj9/test/util/PlatformInfo.java index 3533be59e34..1181a90bafb 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/PlatformInfo.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/PlatformInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/StringPrintStream.java b/test/functional/TestUtilities/src/org/openj9/test/util/StringPrintStream.java index 7a699ca394a..881670ae77a 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/StringPrintStream.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/StringPrintStream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/StringUtilities.java b/test/functional/TestUtilities/src/org/openj9/test/util/StringUtilities.java index 80549763342..c1830273add 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/StringUtilities.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/StringUtilities.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/VersionCheck.java b/test/functional/TestUtilities/src/org/openj9/test/util/VersionCheck.java index 3eacca01817..971f2e5e2ad 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/VersionCheck.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/VersionCheck.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.util; diff --git a/test/functional/TestUtilities/src/org/openj9/test/util/package-info.java b/test/functional/TestUtilities/src/org/openj9/test/util/package-info.java index 15de4530ab3..e44ee7801db 100644 --- a/test/functional/TestUtilities/src/org/openj9/test/util/package-info.java +++ b/test/functional/TestUtilities/src/org/openj9/test/util/package-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetManager.java b/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetManager.java index 39f19585cb3..4138385711b 100644 --- a/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetManager.java +++ b/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetVM.java b/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetVM.java index 68d1f0abea5..e6d50c904e8 100644 --- a/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetVM.java +++ b/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/TargetVM.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.attachAPI; diff --git a/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/package-info.java b/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/package-info.java index d1ddf66030a..0ceab745638 100644 --- a/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/package-info.java +++ b/test/functional/TestUtilitiesJ9/src/org/openj9/test/attachAPI/package-info.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/TestUtilitiesJ9/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCaseCommon.java b/test/functional/TestUtilitiesJ9/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCaseCommon.java index 15893bce168..93e2126520c 100644 --- a/test/functional/TestUtilitiesJ9/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCaseCommon.java +++ b/test/functional/TestUtilitiesJ9/src/org/openj9/test/java/lang/management/ThreadMXBean/ThreadMXBeanTestCaseCommon.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.java.lang.management.ThreadMXBean; diff --git a/test/functional/TestUtilitiesJ9/src/org/openj9/test/jdk/internal/agent/Test_FileSystem_Base.java b/test/functional/TestUtilitiesJ9/src/org/openj9/test/jdk/internal/agent/Test_FileSystem_Base.java index 46e75637a77..0ab95b01b77 100644 --- a/test/functional/TestUtilitiesJ9/src/org/openj9/test/jdk/internal/agent/Test_FileSystem_Base.java +++ b/test/functional/TestUtilitiesJ9/src/org/openj9/test/jdk/internal/agent/Test_FileSystem_Base.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.testng.annotations.Test; diff --git a/test/functional/UnsafeAccess/src/org/openj9/test/access/UnsafeClasses.java b/test/functional/UnsafeAccess/src/org/openj9/test/access/UnsafeClasses.java index 8c6dfc683c1..76759c68b00 100644 --- a/test/functional/UnsafeAccess/src/org/openj9/test/access/UnsafeClasses.java +++ b/test/functional/UnsafeAccess/src/org/openj9/test/access/UnsafeClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.access; diff --git a/test/functional/UnsafeAccess/src_110/org/openj9/test/access/UnsafeClasses.java b/test/functional/UnsafeAccess/src_110/org/openj9/test/access/UnsafeClasses.java index 423dce0ba39..13fcad6f202 100644 --- a/test/functional/UnsafeAccess/src_110/org/openj9/test/access/UnsafeClasses.java +++ b/test/functional/UnsafeAccess/src_110/org/openj9/test/access/UnsafeClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.access; diff --git a/test/functional/UnsafeAccess/src_170/org/openj9/test/access/UnsafeClasses.java b/test/functional/UnsafeAccess/src_170/org/openj9/test/access/UnsafeClasses.java index c626aaff09e..941856c59c2 100644 --- a/test/functional/UnsafeAccess/src_170/org/openj9/test/access/UnsafeClasses.java +++ b/test/functional/UnsafeAccess/src_170/org/openj9/test/access/UnsafeClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.access; diff --git a/test/functional/UnsafeTest/build.xml b/test/functional/UnsafeTest/build.xml index 5fc97142bd3..c91efea5969 100644 --- a/test/functional/UnsafeTest/build.xml +++ b/test/functional/UnsafeTest/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/UnsafeTest/playlist.xml b/test/functional/UnsafeTest/playlist.xml index e819d7009c9..38fb8857e63 100644 --- a/test/functional/UnsafeTest/playlist.xml +++ b/test/functional/UnsafeTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/UnsafeTest/src/org/openj9/test/DummyFile b/test/functional/UnsafeTest/src/org/openj9/test/DummyFile index a96d8c7bd4b..21bf83a7653 100644 --- a/test/functional/UnsafeTest/src/org/openj9/test/DummyFile +++ b/test/functional/UnsafeTest/src/org/openj9/test/DummyFile @@ -17,5 +17,5 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/MainTester.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/MainTester.java index bd4f0b2a23b..0e524b340a1 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/MainTester.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/MainTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestCompareAndSwap.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestCompareAndSwap.java index 8a50521901c..9394793c523 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestCompareAndSwap.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestCompareAndSwap.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccess.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccess.java index ccd24a78328..ebfe3a7fb08 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccess.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java index 258e3f1a009..541e2f0d89c 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java index aed9a221ab6..c71851d9a69 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java index 491075896f3..ad38c3385da 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeCopyMemory.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeCopyMemory.java index ce9ed344bd8..1fd6bda569e 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeCopyMemory.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeCopyMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafePutGetAddress.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafePutGetAddress.java index 8417146729d..4543e5f005f 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafePutGetAddress.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafePutGetAddress.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeSetMemory.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeSetMemory.java index 76e3379c1b6..f179b0c29e9 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeSetMemory.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeSetMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/UnsafeTestBase.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/UnsafeTestBase.java index 20f3379e7c7..3a13fd03734 100644 --- a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/UnsafeTestBase.java +++ b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/UnsafeTestBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/MainTester.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/MainTester.java index 4a4b8a5dae2..d1823357295 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/MainTester.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/MainTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccess.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccess.java index 0aeee473eb7..64aa6c712a6 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccess.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOpaque.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOpaque.java index d27e7667d6c..8a9abe9a291 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOpaque.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOpaque.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java index df4635f375b..908b78c2a7f 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessOrdered.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessUnaligned.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessUnaligned.java index b62bb7bf52b..9638cfd16e8 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessUnaligned.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessUnaligned.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java index 9353d409631..d7ddb16ee39 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAccessVolatile.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java index 9d4586a1848..deb6a52ae60 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeAllocateDirectByteBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndExchange.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndExchange.java index a416017a153..39e9d717525 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndExchange.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndExchange.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndSet.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndSet.java index 094af87e031..eb807911421 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndSet.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCompareAndSet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopyMemory.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopyMemory.java index 2ed154b5490..0c40d01241b 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopyMemory.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopyMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopySwapMemory.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopySwapMemory.java index 51bb3fbbb46..406789308d0 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopySwapMemory.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopySwapMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeGetAndOp.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeGetAndOp.java index 3afec6b6f85..b6e38b9dace 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeGetAndOp.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeGetAndOp.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafePutGetAddress.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafePutGetAddress.java index 8417146729d..4543e5f005f 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafePutGetAddress.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafePutGetAddress.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeSetMemory.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeSetMemory.java index 76e3379c1b6..f179b0c29e9 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeSetMemory.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeSetMemory.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/UnsafeTestBase.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/UnsafeTestBase.java index 6348bad211e..d24c5e9996e 100644 --- a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/UnsafeTestBase.java +++ b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/UnsafeTestBase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.unsafe; diff --git a/test/functional/UnsafeTest/testng.xml b/test/functional/UnsafeTest/testng.xml index 42eb9d1d7f0..2132306506b 100644 --- a/test/functional/UnsafeTest/testng.xml +++ b/test/functional/UnsafeTest/testng.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/VM_Test/SharedClassesSysVTesting/testSC_SysV_Java7_Tests.pl b/test/functional/VM_Test/SharedClassesSysVTesting/testSC_SysV_Java7_Tests.pl index 440e85dab53..8daf18034ab 100644 --- a/test/functional/VM_Test/SharedClassesSysVTesting/testSC_SysV_Java7_Tests.pl +++ b/test/functional/VM_Test/SharedClassesSysVTesting/testSC_SysV_Java7_Tests.pl @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## use strict; diff --git a/test/functional/VM_Test/build.xml b/test/functional/VM_Test/build.xml index 313970dcc40..f53cec3d26e 100644 --- a/test/functional/VM_Test/build.xml +++ b/test/functional/VM_Test/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad1.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad1.java index adbbb445901..34a06e97e47 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad1.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad2.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad2.java index b6b36b2d98e..6cd7b032eed 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad2.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad3.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad3.java index 0176423efb8..4b607237b3b 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad3.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoad3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoadWithException.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoadWithException.java index 525140cb6bb..4cf7d4f404b 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoadWithException.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/ClassToLoadWithException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad1.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad1.java index c6587be3232..ca7303b0b9d 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad1.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad2.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad2.java index 859b2aaa319..4c9584aa349 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad2.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad3.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad3.java index 30f7382cc04..033fa44547a 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad3.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/DependentClassToLoad3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad1.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad1.java index 649ca103042..7ed90c86f8c 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad1.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad2.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad2.java index fb786abe2e8..4b21b9b132b 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad2.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad3.java b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad3.java index 4e716da1c51..b51954ff371 100644 --- a/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad3.java +++ b/test/functional/VM_Test/classUnloadingSupportTests/src/j9vm/test/classunloading/classestoload/InterfaceToLoad3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.classestoload; diff --git a/test/functional/VM_Test/data/.gitignore b/test/functional/VM_Test/data/.gitignore index 6f2d5a8a5ef..033e740fa87 100644 --- a/test/functional/VM_Test/data/.gitignore +++ b/test/functional/VM_Test/data/.gitignore @@ -16,6 +16,6 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 !*.class diff --git a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA1.java b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA1.java index 0bd16cb32d7..211331930c4 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA1.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestA1 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA2.java b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA2.java index 400e2ec5635..345b28ab73a 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA2.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestA2 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA3.java b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA3.java index cc81315a3da..0e0fd589f4e 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA3.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestA3 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA4.java b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA4.java index dd630839874..f079197d132 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource1/TestA4.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource1/TestA4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestA4 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource2/TestB1.java b/test/functional/VM_Test/data/InvalidClasspathResource2/TestB1.java index 9b5fcda9f52..85bce56f315 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource2/TestB1.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource2/TestB1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestB1 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource2/TestB2.java b/test/functional/VM_Test/data/InvalidClasspathResource2/TestB2.java index 401805574b8..31cb007205a 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource2/TestB2.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource2/TestB2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestB2 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource2/TestB3.java b/test/functional/VM_Test/data/InvalidClasspathResource2/TestB3.java index 59efe4ba738..549a0875a0a 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource2/TestB3.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource2/TestB3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestB3 { } diff --git a/test/functional/VM_Test/data/InvalidClasspathResource3/TestC1.java b/test/functional/VM_Test/data/InvalidClasspathResource3/TestC1.java index 833c5583a6d..33216a34129 100644 --- a/test/functional/VM_Test/data/InvalidClasspathResource3/TestC1.java +++ b/test/functional/VM_Test/data/InvalidClasspathResource3/TestC1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestC1 { } diff --git a/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource1/Sample.java b/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource1/Sample.java index df6beffbdcb..a08b0580de3 100644 --- a/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource1/Sample.java +++ b/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource1/Sample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Sample { public static void foo() { diff --git a/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource2/Sample.java b/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource2/Sample.java index 1702e775f6b..a4797f0a3d6 100644 --- a/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource2/Sample.java +++ b/test/functional/VM_Test/data/JarFileUpdateTestRunnerResource2/Sample.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Sample { public static void foo() { diff --git a/test/functional/VM_Test/data/ParentOfChild.java b/test/functional/VM_Test/data/ParentOfChild.java index 3a209d00b17..f262469a9c1 100644 --- a/test/functional/VM_Test/data/ParentOfChild.java +++ b/test/functional/VM_Test/data/ParentOfChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class ParentOfChild { } diff --git a/test/functional/VM_Test/data/ParentlessChild.java b/test/functional/VM_Test/data/ParentlessChild.java index 12a348499fc..31e922b6079 100644 --- a/test/functional/VM_Test/data/ParentlessChild.java +++ b/test/functional/VM_Test/data/ParentlessChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class ParentlessChild extends ParentOfChild { public String toString() { diff --git a/test/functional/VM_Test/j9vm.xml b/test/functional/VM_Test/j9vm.xml index dc9cfa26ed2..9b414b85d3b 100644 --- a/test/functional/VM_Test/j9vm.xml +++ b/test/functional/VM_Test/j9vm.xml @@ -22,7 +22,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/VM_Test/playlist.xml b/test/functional/VM_Test/playlist.xml index d6948aef0b2..ec0e7ca697d 100644 --- a/test/functional/VM_Test/playlist.xml +++ b/test/functional/VM_Test/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/VM_Test/src/com/ibm/j9/benchmarks/adapt/MD5Workers.java b/test/functional/VM_Test/src/com/ibm/j9/benchmarks/adapt/MD5Workers.java index fbf7e8f77ce..da885a91b43 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/benchmarks/adapt/MD5Workers.java +++ b/test/functional/VM_Test/src/com/ibm/j9/benchmarks/adapt/MD5Workers.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.security.MessageDigest; diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/CfdumpTestSuite.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/CfdumpTestSuite.java index 8e7b9e3a3aa..f8ddc763b56 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/CfdumpTestSuite.java +++ b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/CfdumpTestSuite.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import com.ibm.j9.cfdump.tests.lineardump.LinearDumpTests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/LinearDumpTests.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/LinearDumpTests.java index 8b356f897e2..bf50a76168b 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/LinearDumpTests.java +++ b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/LinearDumpTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.cfdump.tests.lineardump; diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/QueryTests.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/QueryTests.java index dbc81fdb632..1c28aa2f89f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/QueryTests.java +++ b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/QueryTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.cfdump.tests.lineardump; diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/Field.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/Field.java index ec8deec548f..538d52f68f6 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/Field.java +++ b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/Field.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/LinearDumpTestCase.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/LinearDumpTestCase.java index bdbfc1e39ad..6b2ed03dc24 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/LinearDumpTestCase.java +++ b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/lineardump/utils/LinearDumpTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.cfdump.tests.lineardump.utils; diff --git a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/utils/Utils.java b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/utils/Utils.java index 157f8033d99..179caa5aa81 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/utils/Utils.java +++ b/test/functional/VM_Test/src/com/ibm/j9/cfdump/tests/utils/Utils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.cfdump.tests.utils; diff --git a/test/functional/VM_Test/src/com/ibm/j9/javaagent/JavaAgent.java b/test/functional/VM_Test/src/com/ibm/j9/javaagent/JavaAgent.java index 79cb355b18c..4eea2d3025e 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/javaagent/JavaAgent.java +++ b/test/functional/VM_Test/src/com/ibm/j9/javaagent/JavaAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.javaagent; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/LockNurseryTest.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/LockNurseryTest.java index 2e4a5552585..8f8793ba266 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/LockNurseryTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/LockNurseryTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/RunTests.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/RunTests.java index c31ebdb6d66..a1be1eb6f3e 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/RunTests.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/RunTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/TestNatives.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/TestNatives.java index dbf14d63b1d..3643e2ef57f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/TestNatives.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/TestNatives.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNatives { diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillAtEnd.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillAtEnd.java index 32261061ead..431640a4117 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillAtEnd.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillAtEnd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillInMiddle.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillInMiddle.java index 18f44d35b01..d7ce1665328 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillInMiddle.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassLockwordInBackfillInMiddle.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillAtEnd.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillAtEnd.java index 88d95b45449..b148a91ec69 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillAtEnd.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillAtEnd.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillInMiddle.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillInMiddle.java index 6b23cfdfb90..ad0fc1da4d2 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillInMiddle.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9ClassWithBackfillInMiddle.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9InheritedLockword.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9InheritedLockword.java index f35a2da19a8..1b7ac210e12 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9InheritedLockword.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9InheritedLockword.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClass.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClass.java index 7f5e00dcdaf..6953ffffd48 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClass.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemoved.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemoved.java index 5ebfd541194..d1311a589e0 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemoved.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemoved.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemovedThenAdded.java b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemovedThenAdded.java index a5c5831e104..71948b63112 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemovedThenAdded.java +++ b/test/functional/VM_Test/src/com/ibm/j9/monitor/tests/utilClasses/J9NoLockwordClassLockwordRemovedThenAdded.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.monitor.tests.utilClasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/numa/LinuxNumaTest.java b/test/functional/VM_Test/src/com/ibm/j9/numa/LinuxNumaTest.java index 37c3edfe901..5d019c3302b 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/numa/LinuxNumaTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/numa/LinuxNumaTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.numa; diff --git a/test/functional/VM_Test/src/com/ibm/j9/numa/NumaChild.java b/test/functional/VM_Test/src/com/ibm/j9/numa/NumaChild.java index 5d26d8986d1..eadcdfb6324 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/numa/NumaChild.java +++ b/test/functional/VM_Test/src/com/ibm/j9/numa/NumaChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.numa; diff --git a/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTest.java b/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTest.java index 8e2df32640a..e80ad17b6b3 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.numa; diff --git a/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTestWrapper.java b/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTestWrapper.java index 1e4a4d961b6..ee1beadbe5d 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTestWrapper.java +++ b/test/functional/VM_Test/src/com/ibm/j9/numa/NumaTestWrapper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.numa; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/FileLister.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/FileLister.java index bdc56d78c8f..528b49dd002 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/FileLister.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/FileLister.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.offload.tests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/HelloWorld.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/HelloWorld.java index 2b9607fbb0a..5a004357ae2 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/HelloWorld.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/HelloWorld.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.offload.tests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/QuarantinePrintfTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/QuarantinePrintfTest.java index 0a76001e5fa..4c1629e4e1c 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/QuarantinePrintfTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/QuarantinePrintfTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/RunTests.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/RunTests.java index 4f0a15023f6..3d4ea1bca5d 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/RunTests.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/RunTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/InvocationCost.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/InvocationCost.java index 8b3daa986dd..b2447736ccc 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/InvocationCost.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/InvocationCost.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import com.ibm.j9.offload.tests.invcost.TestNativesInv; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/TestNativesInv.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/TestNativesInv.java index 3b58b944272..3fdbff2d70a 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/TestNativesInv.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/invcost/TestNativesInv.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNativesInv { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/HelloWorld.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/HelloWorld.java index 614c6d2ae41..980ad0a6b0d 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/HelloWorld.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/HelloWorld.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class HelloWorld { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTest.java index df393b77b04..39420c99f4f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTestRegisterNatives.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTestRegisterNatives.java index 04ff47032ce..40de6628a51 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTestRegisterNatives.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JNIServiceTestRegisterNatives.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JValue.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JValue.java index 4635feea310..f8bea770fe8 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JValue.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/JValue.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class JValue { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/NativeThread.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/NativeThread.java index 1bbdec2e256..892aa212c1d 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/NativeThread.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/NativeThread.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNatives.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNatives.java index 77602b95393..e4dc08fb131 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNatives.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNatives.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNatives implements TestNativesInterface { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesChild.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesChild.java index 4fec5b4c66e..3daa0a97bb6 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesChild.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesChild.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNativesChild extends TestNatives { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesInterface.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesInterface.java index 78c589228d4..f587760717b 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesInterface.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesInterface.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.offload.tests.jniservice; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesRegisterNatives.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesRegisterNatives.java index 493b796e637..81039b51b37 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesRegisterNatives.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jniservice/TestNativesRegisterNatives.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNativesRegisterNatives { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/ExitWithReturnCode78.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/ExitWithReturnCode78.java index b620aecaffb..4173b1793c4 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/ExitWithReturnCode78.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/ExitWithReturnCode78.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait1Second.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait1Second.java index f229b142053..9025fb85bd1 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait1Second.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait1Second.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait20Seconds.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait20Seconds.java index ee0eaf9b8dd..aca99f7561e 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait20Seconds.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/jvmservice/Wait20Seconds.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryNatives.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryNatives.java index 52e06c93a5b..ad5772658fc 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryNatives.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryNatives.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryTest.java index b149e96570e..13887cb3ced 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/LibraryTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/OnUnloadTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/OnUnloadTest.java index ba5b387a562..fd9ad218059 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/OnUnloadTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/library/OnUnloadTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URLClassLoader; import java.net.URL; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/LoadClass.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/LoadClass.java index bd07f2fd766..447e29b5379 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/LoadClass.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/LoadClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/NoClass.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/NoClass.java index 6c7d6c54eec..97e177a452c 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/NoClass.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/NoClass.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/RunMappingTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/RunMappingTest.java index 4c4218ac26f..d2e5b2f7630 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/RunMappingTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/RunMappingTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/TestClass.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/TestClass.java index 9bcbf0b5e95..7b457bc1179 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/TestClass.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/mapping/TestClass.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/RunNativesLocallyTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/RunNativesLocallyTest.java index 9be45dfd784..51a166d1cf0 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/RunNativesLocallyTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/RunNativesLocallyTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/TriggerMathNative.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/TriggerMathNative.java index bb39d8dae4d..81e962f826b 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/TriggerMathNative.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/runlocal/TriggerMathNative.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.offload.tests.runlocal; diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/TestNativesUnsafe.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/TestNativesUnsafe.java index 2f4da1fa7c1..e83eb2b15f0 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/TestNativesUnsafe.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/TestNativesUnsafe.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNativesUnsafe { diff --git a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/UnsafeMemTest.java b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/UnsafeMemTest.java index 6b54ac20f8f..588f7e9cc5f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/UnsafeMemTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/offload/tests/unsafemem/UnsafeMemTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/AnnotationDefaultTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/AnnotationDefaultTest.java index 76fc8bf8b15..e0352ce4281 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/AnnotationDefaultTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/AnnotationDefaultTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/BootstrapMethods.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/BootstrapMethods.java index 4ea2ad7aaa0..1603a22f32c 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/BootstrapMethods.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/BootstrapMethods.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ConstantValueTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ConstantValueTest.java index a0a14ea79c9..d042a90a612 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ConstantValueTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ConstantValueTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/CustomExceptionGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/CustomExceptionGenerator.java index 9138ceacf6b..a27fe458e58 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/CustomExceptionGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/CustomExceptionGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/DeprecatedTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/DeprecatedTest.java index 713948457a9..c50a0983450 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/DeprecatedTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/DeprecatedTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionTableTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionTableTest.java index 5ab53393579..6b1213df46f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionTableTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionTableTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionsTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionsTest.java index d2c5a49c967..c4217081d03 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/ExceptionsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InnerClassesTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InnerClassesTest.java index bff9741f4d2..8b6e9718e7e 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InnerClassesTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InnerClassesTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InvokeDynamicTestGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InvokeDynamicTestGenerator.java index 3471a819f92..d4dc4f86c39 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InvokeDynamicTestGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/InvokeDynamicTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestGenerator.java index 6240ff15e8e..d8bc52376e3 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestLoader.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestLoader.java index 5a6aa144ecc..6a894da6098 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestLoader.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETStressTestLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETTestGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETTestGenerator.java index 83c9992c8ea..963bf82ebf9 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETTestGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/JSRRETTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MixedAnnotationsTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MixedAnnotationsTest.java index c447211f45c..a57f3bd28a9 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MixedAnnotationsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MixedAnnotationsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleAnnotationsTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleAnnotationsTest.java index b70e9ec4018..27849ec329d 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleAnnotationsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleAnnotationsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleInterfacesTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleInterfacesTest.java index c7f638f0c02..9c72ca3808f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleInterfacesTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleInterfacesTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleRuntimeVisibleAnnotationsTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleRuntimeVisibleAnnotationsTest.java index 2b3e8f23e46..cecb7768a0d 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleRuntimeVisibleAnnotationsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/MultipleRuntimeVisibleAnnotationsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotations.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotations.java index 3c582912171..aa8ee06db95 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotations.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotations.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotationsTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotationsTest.java index 6f2de214452..6da29f4d3c3 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotationsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeInvisibleAnnotationsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation1.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation1.java index 16475eace17..c0d57dcfd91 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation1.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation2.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation2.java index 1a9d18e9e26..c373a8de295 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation2.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/RuntimeVisibleAnnotation2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface1.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface1.java index b328b841aff..562387f843c 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface1.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface2.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface2.java index ebafc545903..32fed1fc4b5 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface2.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SampleInterface2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestGenerator.java index 73408001294..fde30d38264 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestIntfGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestIntfGenerator.java index f23c32c4f10..15e1b0d1db5 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestIntfGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SharedInvokersTestIntfGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SignatureTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SignatureTest.java index 7c45eb90406..3945dcd9ee4 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SignatureTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SignatureTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleInterfaceTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleInterfaceTest.java index 18e6fbf0257..4e3a6966644 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleInterfaceTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleInterfaceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleRuntimeVisibleAnnotationsTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleRuntimeVisibleAnnotationsTest.java index b5014f5f066..bee0b868043 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleRuntimeVisibleAnnotationsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SingleRuntimeVisibleAnnotationsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SourceDebugExtensionTestGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SourceDebugExtensionTestGenerator.java index 3756ac57403..5b6e6e19dab 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SourceDebugExtensionTestGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SourceDebugExtensionTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableTest.java index ba0451d8302..d2ae897aebc 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableWithByteBooleanArrayTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableWithByteBooleanArrayTest.java index 5cfc34b7beb..c3800c22d2a 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableWithByteBooleanArrayTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/StackMapTableWithByteBooleanArrayTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SyntheticTestGenerator.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SyntheticTestGenerator.java index f8cc59e961e..16ab60033df 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SyntheticTestGenerator.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/testclasses/SyntheticTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.testclasses; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/JSRRETRecreateClassTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/JSRRETRecreateClassTest.java index d1bed4eb5e7..688fee4ac7f 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/JSRRETRecreateClassTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/JSRRETRecreateClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.tests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassCompareTest.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassCompareTest.java index 0091efec35b..ce33cb632a5 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassCompareTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassCompareTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.tests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassTestSuite.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassTestSuite.java index 613db17cd50..68fde00f33a 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassTestSuite.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/tests/RecreateClassTestSuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.tests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/utils/RecreateClassUtils.java b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/utils/RecreateClassUtils.java index e93577c6c62..21c5090450b 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/recreateclass/utils/RecreateClassUtils.java +++ b/test/functional/VM_Test/src/com/ibm/j9/recreateclass/utils/RecreateClassUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.recreateclass.utils; diff --git a/test/functional/VM_Test/src/com/ibm/j9/sharedCacheAPI/tests/SharedUtilsTest.java b/test/functional/VM_Test/src/com/ibm/j9/sharedCacheAPI/tests/SharedUtilsTest.java index 042c529d8de..5ea43cffe82 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/sharedCacheAPI/tests/SharedUtilsTest.java +++ b/test/functional/VM_Test/src/com/ibm/j9/sharedCacheAPI/tests/SharedUtilsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.sharedCacheAPI.tests; diff --git a/test/functional/VM_Test/src/com/ibm/j9/test/tools/classfilecompare/ClassFileCompare.java b/test/functional/VM_Test/src/com/ibm/j9/test/tools/classfilecompare/ClassFileCompare.java index ff1ed096732..0b085cec655 100644 --- a/test/functional/VM_Test/src/com/ibm/j9/test/tools/classfilecompare/ClassFileCompare.java +++ b/test/functional/VM_Test/src/com/ibm/j9/test/tools/classfilecompare/ClassFileCompare.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.test.tools.classfilecompare; diff --git a/test/functional/VM_Test/src/com/ibm/oti/jvmtests/AutoRun.java b/test/functional/VM_Test/src/com/ibm/oti/jvmtests/AutoRun.java index 6229f5af2c8..a4ef5321928 100644 --- a/test/functional/VM_Test/src/com/ibm/oti/jvmtests/AutoRun.java +++ b/test/functional/VM_Test/src/com/ibm/oti/jvmtests/AutoRun.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/com/ibm/oti/jvmtests/GetNanoTimeAdjustment.java b/test/functional/VM_Test/src/com/ibm/oti/jvmtests/GetNanoTimeAdjustment.java index 89314990ada..52329c2f305 100644 --- a/test/functional/VM_Test/src/com/ibm/oti/jvmtests/GetNanoTimeAdjustment.java +++ b/test/functional/VM_Test/src/com/ibm/oti/jvmtests/GetNanoTimeAdjustment.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.jvmtests; diff --git a/test/functional/VM_Test/src/com/ibm/oti/jvmtests/SupportJVM.java b/test/functional/VM_Test/src/com/ibm/oti/jvmtests/SupportJVM.java index 8ada4fad926..3068e2032a9 100644 --- a/test/functional/VM_Test/src/com/ibm/oti/jvmtests/SupportJVM.java +++ b/test/functional/VM_Test/src/com/ibm/oti/jvmtests/SupportJVM.java @@ -20,7 +20,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SupportJVM { diff --git a/test/functional/VM_Test/src/j9vm/regression/ClassLoadDuringException.java b/test/functional/VM_Test/src/j9vm/regression/ClassLoadDuringException.java index e639a5d1bec..3b81e01f1bd 100644 --- a/test/functional/VM_Test/src/j9vm/regression/ClassLoadDuringException.java +++ b/test/functional/VM_Test/src/j9vm/regression/ClassLoadDuringException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.regression; diff --git a/test/functional/VM_Test/src/j9vm/runner/AllTestsInJar.java b/test/functional/VM_Test/src/j9vm/runner/AllTestsInJar.java index a0d38da4e3e..27dcc5e2d66 100644 --- a/test/functional/VM_Test/src/j9vm/runner/AllTestsInJar.java +++ b/test/functional/VM_Test/src/j9vm/runner/AllTestsInJar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.runner; import java.util.*; diff --git a/test/functional/VM_Test/src/j9vm/runner/Menu.java b/test/functional/VM_Test/src/j9vm/runner/Menu.java index 58a95ee719c..0196ca61e14 100644 --- a/test/functional/VM_Test/src/j9vm/runner/Menu.java +++ b/test/functional/VM_Test/src/j9vm/runner/Menu.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.runner; import java.util.*; diff --git a/test/functional/VM_Test/src/j9vm/runner/MenuItem.java b/test/functional/VM_Test/src/j9vm/runner/MenuItem.java index 2e71d799075..9112b68939e 100644 --- a/test/functional/VM_Test/src/j9vm/runner/MenuItem.java +++ b/test/functional/VM_Test/src/j9vm/runner/MenuItem.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.runner; import java.util.*; diff --git a/test/functional/VM_Test/src/j9vm/runner/OutputCollector.java b/test/functional/VM_Test/src/j9vm/runner/OutputCollector.java index 3f948e3ca19..778d11b404a 100644 --- a/test/functional/VM_Test/src/j9vm/runner/OutputCollector.java +++ b/test/functional/VM_Test/src/j9vm/runner/OutputCollector.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.runner; diff --git a/test/functional/VM_Test/src/j9vm/runner/Runner.java b/test/functional/VM_Test/src/j9vm/runner/Runner.java index 5325d388986..b4704572f5f 100644 --- a/test/functional/VM_Test/src/j9vm/runner/Runner.java +++ b/test/functional/VM_Test/src/j9vm/runner/Runner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.runner; import java.io.*; diff --git a/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedArrayCopyTest.java b/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedArrayCopyTest.java index 78711d86848..eb13ae4ef30 100644 --- a/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedArrayCopyTest.java +++ b/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedArrayCopyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Apr 29, 2008 diff --git a/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedBackwardArrayCopyTest.java b/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedBackwardArrayCopyTest.java index 8dd61145aec..226a6f3c5cf 100644 --- a/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedBackwardArrayCopyTest.java +++ b/test/functional/VM_Test/src/j9vm/test/arraycopy/MultiThreadedBackwardArrayCopyTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.arraycopy; diff --git a/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTest.java b/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTest.java index 0cddadc1dcf..ab16ba268bf 100644 --- a/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTest.java +++ b/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.arraylets; diff --git a/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTestRunner.java b/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTestRunner.java index a22f86b2564..b1187bd8de2 100644 --- a/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/arraylets/ArrayletAllocateTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.arraylets; diff --git a/test/functional/VM_Test/src/j9vm/test/arraystore/ArrayIntoCloneableArrayTest.java b/test/functional/VM_Test/src/j9vm/test/arraystore/ArrayIntoCloneableArrayTest.java index a7b744af997..400d5293919 100644 --- a/test/functional/VM_Test/src/j9vm/test/arraystore/ArrayIntoCloneableArrayTest.java +++ b/test/functional/VM_Test/src/j9vm/test/arraystore/ArrayIntoCloneableArrayTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.arraystore; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ClassloadingBenchmark.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ClassloadingBenchmark.java index e013532d4a3..5fb45fc7c64 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ClassloadingBenchmark.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ClassloadingBenchmark.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ZipFileBenchmark.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ZipFileBenchmark.java index 0025af8f3ac..ddb74fe4d43 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ZipFileBenchmark.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/ZipFileBenchmark.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass1.java index 8d2e7121341..92fc3992bb4 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass10.java index 11cef2c20e7..f25f5456323 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass11.java index 96805e17ac0..85463b10547 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass12.java index 205a968fa4f..0cee878b25a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass13.java index e23d2fb3ac4..72e41b705f3 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass14.java index 1a7ec1fc991..f07ad634482 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass15.java index ce7b6785d05..ea229784b70 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass16.java index c2571fe9acb..e3cbaa24509 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass17.java index dff2d5e74d7..5c8186dbc01 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass18.java index b2843e60faf..68f3c2ccf5d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass19.java index 0272efa1bbd..d00e34d3482 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass2.java index 059c9e1d3bd..07ee4056cbd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass20.java index d2f6790869f..94774116dc9 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass3.java index b16e63bd013..7d44b967f79 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass4.java index 68f7c4a6572..014e9af5a3d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass5.java index 4c681d11daf..49207caba22 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass6.java index 964335d4dc7..b2078588f22 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass7.java index 00200af0320..8da8610d46e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass8.java index 80355d9bf99..240eb03288f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass9.java index 6b23a52bc04..6ca5cbe001e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses1/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses1; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass1.java index 2876a8a43c3..78579a0d24e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass10.java index ac89bfc2dd3..fbd7fce2819 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass11.java index 40deed10a74..ab1a65f0dcb 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass12.java index cb4c9a15075..961c1de68d0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass13.java index 3299914c352..2deeee26f84 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass14.java index c0bf1b97c03..2c9e2916424 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass15.java index bbe5bfbf0a5..eaa129adf6f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass16.java index 70b4b12794c..d03070e1a44 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass17.java index 3c5d01e3492..f2902ba1c02 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass18.java index b6fe2106666..bcb97fc4c5e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass19.java index a3b15e77062..69847c3b236 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass2.java index a758174ce0a..37597d5a448 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass20.java index d4d48fdd071..b3da57d4290 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass3.java index 886a1592adf..a537fb575c3 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass4.java index f58c11cde6b..5aa9d2ae7dd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass5.java index ce17c9c4505..480e9db1034 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass6.java index 579d6ce13f8..81bba211d90 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass7.java index 18457f9c0fd..af97e4a1393 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass8.java index 7ed29aad05a..9387114d534 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass9.java index 4ba377dcce6..7ddbf2f5c52 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses10/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses10; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass1.java index 13525a68747..2fca6d88bfa 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass10.java index f778b566995..7194aea3805 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass11.java index 97afed2c509..8db5f6e6ac0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass12.java index 4e508a2a009..0b7bc4de69e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass13.java index 07c242501ae..d327b2d1bf0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass14.java index 130486d33a6..d458e5e5813 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass15.java index e293eb50a11..fddf4d80f04 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass16.java index adf0116b284..0c9d35d50c4 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass17.java index dacccd3d457..aac5c35dc1f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass18.java index 2c2a8e9ae81..043ad445209 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass19.java index 3e3a4fca265..e3b7551df9e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass2.java index ce71cefefff..2ad98b4917b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass20.java index 5ceb5a3c6ad..7a25f868bbe 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass3.java index ebbe519cd17..c718e827d9a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass4.java index 52aec3783f1..34c10b8e472 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass5.java index eb8a0b98d0e..b449237852f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass6.java index 885ab0e50f9..0bf459d4a24 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass7.java index 7864b20640f..88cb8f07d63 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass8.java index 21305d99cdf..872f3cbd35d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass9.java index 753a70e99c9..8d036dd79ef 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses2/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses2; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass1.java index 905fd153f74..45f080ab997 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass10.java index 28c2a02a41c..24e8f675e1f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass11.java index 05ba55cb58f..36f2bbdc0c1 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass12.java index e0f27f4798e..2aa561be17a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass13.java index a57f46f845b..fbcbd64545c 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass14.java index 0248a48dd11..cf16bc71365 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass15.java index dc715a417e7..95fb952cedc 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass16.java index 29f1abd799d..c9752a32cdd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass17.java index b6c9380b04c..e40025470a2 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass18.java index 525cb6a7dd0..9f886971e3a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass19.java index b9f553424ab..82858bd53a5 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass2.java index 57ab00a0777..d61d86d0da8 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass20.java index 07ae36ad1c9..f9966bf2426 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass3.java index cc3520b082f..677f15b6c89 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass4.java index d72082b245e..e4a59e3b809 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass5.java index e0d5966154f..3744837a16f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass6.java index eede6ca039d..f5097d228fe 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass7.java index 62566199c3f..ebc5962577f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass8.java index 83270345703..8b260a2b24b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass9.java index 38a6d769ac6..6f47fad9e8b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses3/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses3; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass1.java index 590d3fbb871..a8d73883e62 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass10.java index 9e6231a088d..dcad3161bfb 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass11.java index d6d59c4db92..1bde84e9ccf 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass12.java index acbeaf63780..bb0e559a209 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass13.java index 3f9b92d263c..b604b28ff4d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass14.java index 6ae9731384f..864e4a9ad23 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass15.java index 4c3cdc28270..136549e3239 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass16.java index 55ec5444f31..0c15fc387c0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass17.java index 0454488ac09..9c7f84ada2a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass18.java index 1e9a08032c3..bf8cfd2d319 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass19.java index 8a067b3b7cc..88cb14e46a8 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass2.java index 92d7935982d..9c55629d8fd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass20.java index 682c1f1053e..b5a6b8f2935 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass3.java index 0b39f813084..f20e6714f23 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass4.java index 1015503a6c8..77c2bb39fc4 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass5.java index c7fca83132a..50187c7fa6f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass6.java index 8f3c87c1d3c..5a2024ae7bd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass7.java index ee267168999..3fe95f4b2c1 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass8.java index b3e19554b67..d4f30382ff5 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass9.java index a571047ec75..a9cf56a9102 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses4/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses4; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass1.java index 1c5539b235f..44311b9e66c 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass10.java index fd88abbd06d..222f0a4df55 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass11.java index 72ee841064c..94a50d6d50b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass12.java index b86dc6ea5de..a86e922f58f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass13.java index 08b8064d0a9..49fba1b20e0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass14.java index ae595468a37..fbb56a2078b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass15.java index 1983e8f0c3b..0b1b0898af9 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass16.java index 12620adc57c..22ede8583f2 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass17.java index 1ab8d97687b..a38df99c5ce 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass18.java index c8e96382ae3..4a4d7ee95d8 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass19.java index e5d830b1863..b2db1a6c115 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass2.java index 1dd2a99a2a9..507fe10b8db 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass20.java index 4738ebe3900..0933fa277db 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass3.java index 94e7e702741..b464e18aac6 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass4.java index 579dc262a63..fa1798c7f95 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass5.java index 342ff6199b3..ba865cf49df 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass6.java index 95356a3f4f9..ffe8f9ac429 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass7.java index 96177033bfe..c3575f30510 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass8.java index 1170cb81a0d..3655cc16d91 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass9.java index 2e87c57915d..d60b13e9bf1 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses5/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses5; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass1.java index d0e96a83739..aa614dc2b2a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass10.java index e4744bd6170..4bd9d4990aa 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass11.java index c6c116701da..c4b3c5da397 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass12.java index 312e89743ff..d94593c19fe 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass13.java index b523946d48f..00df50dd7c5 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass14.java index 45e35d50731..b8aa47b821a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass15.java index 67a82857a68..80975167b63 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass16.java index 3a87e4aa813..d1bbd288668 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass17.java index 596e532c774..a3979b7c528 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass18.java index 1c697d788af..b2f66982f5d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass19.java index 7b845303399..cd931809f81 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass2.java index d9ac670ab2c..fa2bb4d0af8 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass20.java index 8abdca8a025..d4cc1a6bfed 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass3.java index 5413c85b8f5..46f8c8bd119 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass4.java index 1f938ce2a4b..7bfc752cc90 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass5.java index 29a32fa6af2..a32aa85b2f5 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass6.java index 5bc9ae70a7b..12c9b125c44 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass7.java index 130b51d9bc3..e921a193f0d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass8.java index acda504bf01..ea278f516df 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass9.java index fad9dd080c4..79785f5475d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses6/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses6; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass1.java index d2f819817eb..2a4a0a6873f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass10.java index f3c1d970d43..49bf63bfb0b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass11.java index 18c660d68df..0340dfabd2c 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass12.java index be468961b64..a5632ab0ad9 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass13.java index c3947737aa5..3a5a9dab0f9 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass14.java index 425573d00d1..6517af42a39 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass15.java index 7c221f2b08d..6723134d0e6 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass16.java index 4adb58aa39d..29d04bd055e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass17.java index c5af36aaf55..f715fa05ac1 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass18.java index 982c5f4c80c..b9fb4e60b3c 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass19.java index a9f33731c31..e1bf7801771 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass2.java index 6083642e020..4953b1aa98e 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass20.java index 933843dd3be..f1a017af566 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass3.java index f8c5c400bd1..4c7264da5c0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass4.java index 197f932db4c..75c18f94eed 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass5.java index f4d82aa8308..bf545686b6f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass6.java index 201a18dcbbf..8bda1287001 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass7.java index a92b912c7ec..38c86fbd6c9 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass8.java index 1be975966b4..b58767bfaa3 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass9.java index 752b76baec9..18d2651348c 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses7/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses7; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass1.java index 2ffd00176ec..95a5a540829 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass10.java index 093c84e2887..be7e06e6b6f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass11.java index 6e6fd820ba9..996c69e6b21 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass12.java index 9c91e3f776d..06127054cfc 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass13.java index e0af1b5da20..47c78b2bc2d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass14.java index 8f54941e57b..4eed9cc006d 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass15.java index 230137fc922..363e14df597 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass16.java index d0800238f75..87a4c826ad1 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass17.java index 0b7c095b48e..f657630281c 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass18.java index 5601bbbe3c3..225779447da 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass19.java index 3aa076e5628..9ac48fa5456 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass2.java index 275570bb728..205bd655f33 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass20.java index 66c5d26b770..b939d2a5d41 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass3.java index 592bfbe8646..9a380f28c85 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass4.java index 0f26f516346..f5498dcb664 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass5.java index 2bc4d8d7e12..4ff0fe691de 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass6.java index b25ece511b5..5c02cc93bcd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass7.java index 6eafc3aa59e..98e56092c57 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass8.java index ae4c2cc37ed..f49adcacefd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass9.java index a6b68e24b6f..8d188d9ac23 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses8/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses8; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass1.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass1.java index 474a6315f98..ccf5c98f3e4 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass1.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass10.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass10.java index 374ae62ad6c..6e0de3593a5 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass10.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass11.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass11.java index b45baa0a3b4..5fefd19e6e9 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass11.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass12.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass12.java index da2d1353577..f245449687f 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass12.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass13.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass13.java index 81c91520e18..588073a8be0 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass13.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass14.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass14.java index a68527d3886..7248c7fe8f6 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass14.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass15.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass15.java index 71297ecefd5..3bfb46de0bb 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass15.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass16.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass16.java index c395ceff71e..95360fcf3fd 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass16.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass17.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass17.java index 038e2e98d3d..4ff9bc9b6a6 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass17.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass18.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass18.java index 62eae3e4c51..e5fcb6681c6 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass18.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass19.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass19.java index 78fe857ce46..c38fa05f882 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass19.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass2.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass2.java index 596d63e7cd7..f001c991363 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass2.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass20.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass20.java index b6c532a8905..15641831754 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass20.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass3.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass3.java index d80d8fa0a7b..5fd9207c51b 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass3.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass4.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass4.java index f58a862da21..80a9d506794 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass4.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass5.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass5.java index b9261810986..ecbe73d8284 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass5.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass6.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass6.java index 1ea8077455c..3e4c1fe4585 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass6.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass7.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass7.java index e0711fffafa..c56fe73446a 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass7.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass8.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass8.java index 736f99d755f..071b8689cab 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass8.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass9.java b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass9.java index b6119743f04..257eb091971 100644 --- a/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass9.java +++ b/test/functional/VM_Test/src/j9vm/test/benchmark/zipfile/testclasses9/TestClass9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.benchmark.zipfile.testclasses9; diff --git a/test/functional/VM_Test/src/j9vm/test/classloading/K32MethodTest.java b/test/functional/VM_Test/src/j9vm/test/classloading/K32MethodTest.java index 7af17f67842..0e23c3eb2d8 100644 --- a/test/functional/VM_Test/src/j9vm/test/classloading/K32MethodTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classloading/K32MethodTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 29, 2004 diff --git a/test/functional/VM_Test/src/j9vm/test/classloading/K64MethodTest.java b/test/functional/VM_Test/src/j9vm/test/classloading/K64MethodTest.java index cfce7be8190..6d2f759a00d 100644 --- a/test/functional/VM_Test/src/j9vm/test/classloading/K64MethodTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classloading/K64MethodTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 29, 2004 diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/ClassPathSettingClassLoader.java b/test/functional/VM_Test/src/j9vm/test/classunloading/ClassPathSettingClassLoader.java index 2149340ecb2..de819d1ae3b 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/ClassPathSettingClassLoader.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/ClassPathSettingClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; import com.ibm.oti.vm.VM; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/ClassUnloadingTestParent.java b/test/functional/VM_Test/src/j9vm/test/classunloading/ClassUnloadingTestParent.java index cbe377df6fa..89b71b02609 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/ClassUnloadingTestParent.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/ClassUnloadingTestParent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/Counter.java b/test/functional/VM_Test/src/j9vm/test/classunloading/Counter.java index ef0c6bada51..9b80f92e72c 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/Counter.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/Counter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/DelegatingJarClassLoader.java b/test/functional/VM_Test/src/j9vm/test/classunloading/DelegatingJarClassLoader.java index e46b608d2ef..21e427b44f6 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/DelegatingJarClassLoader.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/DelegatingJarClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/FinalizationIndicator.java b/test/functional/VM_Test/src/j9vm/test/classunloading/FinalizationIndicator.java index 25591b95022..f9c76f65962 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/FinalizationIndicator.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/FinalizationIndicator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/FriendlyJarClassLoader.java b/test/functional/VM_Test/src/j9vm/test/classunloading/FriendlyJarClassLoader.java index d0392c4aaf3..ae34fbab22a 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/FriendlyJarClassLoader.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/FriendlyJarClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/SelectiveJarClassLoader.java b/test/functional/VM_Test/src/j9vm/test/classunloading/SelectiveJarClassLoader.java index 4c29cfc5b86..05c4e8dbfa7 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/SelectiveJarClassLoader.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/SelectiveJarClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/SimpleJarClassLoader.java b/test/functional/VM_Test/src/j9vm/test/classunloading/SimpleJarClassLoader.java index e6c2d5a29e0..8f685471327 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/SimpleJarClassLoader.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/SimpleJarClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/ClassPathSettingClassLoaderTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/ClassPathSettingClassLoaderTest.java index 09aa8f946d9..dd27b4861be 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/ClassPathSettingClassLoaderTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/ClassPathSettingClassLoaderTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DelegatedLoadUnloadTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DelegatedLoadUnloadTest.java index 3c23ea38202..7781e56a44d 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DelegatedLoadUnloadTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DelegatedLoadUnloadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DiscardOneOfTwoSiblingsTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DiscardOneOfTwoSiblingsTest.java index f4824264c0f..42df543ea59 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DiscardOneOfTwoSiblingsTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/DiscardOneOfTwoSiblingsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/EmptyClassLoaderFinalizationTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/EmptyClassLoaderFinalizationTest.java index 2b9c8c64ebb..e03a78f6c5b 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/EmptyClassLoaderFinalizationTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/EmptyClassLoaderFinalizationTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/HoldOnToClassTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/HoldOnToClassTest.java index 808e0533494..2aa91636950 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/HoldOnToClassTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/HoldOnToClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/InterdependentClassLoadersTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/InterdependentClassLoadersTest.java index 14e68160ed4..400013d409d 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/InterdependentClassLoadersTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/InterdependentClassLoadersTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithChildAndDiscardChildTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithChildAndDiscardChildTest.java index 052183b2fbd..e001107e952 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithChildAndDiscardChildTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithChildAndDiscardChildTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithGrandParentAndHoldGrandChildTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithGrandParentAndHoldGrandChildTest.java index 9e0a4ddc968..9e6bcf03e51 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithGrandParentAndHoldGrandChildTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithGrandParentAndHoldGrandChildTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardChildTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardChildTest.java index 1dca606ad8a..f1d7de597d3 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardChildTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardChildTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardParentTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardParentTest.java index 9ca8fa2c3c0..27b5e73fe80 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardParentTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndDiscardParentTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndHoldClassTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndHoldClassTest.java index 6f9d1a210c4..dbf5e555321 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndHoldClassTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/LoadWithParentAndHoldClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/SimpleLoadUnloadTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/SimpleLoadUnloadTest.java index c7cd03d5024..c8d7d63ece8 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/SimpleLoadUnloadTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/SimpleLoadUnloadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classunloading.testcases; diff --git a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/UnloadedStackTraceTest.java b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/UnloadedStackTraceTest.java index 941c8f70627..6cc9b34edf6 100644 --- a/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/UnloadedStackTraceTest.java +++ b/test/functional/VM_Test/src/j9vm/test/classunloading/testcases/UnloadedStackTraceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on May 31, 2004 diff --git a/test/functional/VM_Test/src/j9vm/test/cleanup/NumberOfThreads.java b/test/functional/VM_Test/src/j9vm/test/cleanup/NumberOfThreads.java index e6fdc06c1b8..63990f77aac 100644 --- a/test/functional/VM_Test/src/j9vm/test/cleanup/NumberOfThreads.java +++ b/test/functional/VM_Test/src/j9vm/test/cleanup/NumberOfThreads.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.cleanup; diff --git a/test/functional/VM_Test/src/j9vm/test/clinit/BlockDuringClinitTest.java b/test/functional/VM_Test/src/j9vm/test/clinit/BlockDuringClinitTest.java index 3f9d12c8709..8919a0d451c 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinit/BlockDuringClinitTest.java +++ b/test/functional/VM_Test/src/j9vm/test/clinit/BlockDuringClinitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinit; diff --git a/test/functional/VM_Test/src/j9vm/test/clinit/GetStaticDuringClinit.java b/test/functional/VM_Test/src/j9vm/test/clinit/GetStaticDuringClinit.java index c7569820b1c..937eca7b472 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinit/GetStaticDuringClinit.java +++ b/test/functional/VM_Test/src/j9vm/test/clinit/GetStaticDuringClinit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinit; diff --git a/test/functional/VM_Test/src/j9vm/test/clinit/InvokeStaticDuringClinit.java b/test/functional/VM_Test/src/j9vm/test/clinit/InvokeStaticDuringClinit.java index 0824575b350..74165cc33ef 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinit/InvokeStaticDuringClinit.java +++ b/test/functional/VM_Test/src/j9vm/test/clinit/InvokeStaticDuringClinit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinit; diff --git a/test/functional/VM_Test/src/j9vm/test/clinit/NewDuringClinit.java b/test/functional/VM_Test/src/j9vm/test/clinit/NewDuringClinit.java index 58e5b2d6b89..d8995412b0f 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinit/NewDuringClinit.java +++ b/test/functional/VM_Test/src/j9vm/test/clinit/NewDuringClinit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinit; diff --git a/test/functional/VM_Test/src/j9vm/test/clinit/PutStaticDuringClinit.java b/test/functional/VM_Test/src/j9vm/test/clinit/PutStaticDuringClinit.java index 6daf1aea9e3..6c68f7542db 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinit/PutStaticDuringClinit.java +++ b/test/functional/VM_Test/src/j9vm/test/clinit/PutStaticDuringClinit.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinit; diff --git a/test/functional/VM_Test/src/j9vm/test/clinitexception/ClassWithClinitException.java b/test/functional/VM_Test/src/j9vm/test/clinitexception/ClassWithClinitException.java index 2a107fb169e..de69865993d 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinitexception/ClassWithClinitException.java +++ b/test/functional/VM_Test/src/j9vm/test/clinitexception/ClassWithClinitException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinitexception; diff --git a/test/functional/VM_Test/src/j9vm/test/clinitexception/ClinitExceptionTest.java b/test/functional/VM_Test/src/j9vm/test/clinitexception/ClinitExceptionTest.java index 539aa3c9f77..9c26bc9b5ae 100644 --- a/test/functional/VM_Test/src/j9vm/test/clinitexception/ClinitExceptionTest.java +++ b/test/functional/VM_Test/src/j9vm/test/clinitexception/ClinitExceptionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clinitexception; diff --git a/test/functional/VM_Test/src/j9vm/test/clone/CloneNotSupportedTest.java b/test/functional/VM_Test/src/j9vm/test/clone/CloneNotSupportedTest.java index b9ed9daa057..fc704189317 100644 --- a/test/functional/VM_Test/src/j9vm/test/clone/CloneNotSupportedTest.java +++ b/test/functional/VM_Test/src/j9vm/test/clone/CloneNotSupportedTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clone; diff --git a/test/functional/VM_Test/src/j9vm/test/clone/CloneWeakReferenceTest.java b/test/functional/VM_Test/src/j9vm/test/clone/CloneWeakReferenceTest.java index 0fd8c2c7a4b..f79f50d4961 100644 --- a/test/functional/VM_Test/src/j9vm/test/clone/CloneWeakReferenceTest.java +++ b/test/functional/VM_Test/src/j9vm/test/clone/CloneWeakReferenceTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clone; diff --git a/test/functional/VM_Test/src/j9vm/test/clone/SynchronizedCloneTest.java b/test/functional/VM_Test/src/j9vm/test/clone/SynchronizedCloneTest.java index e45192ee7dd..7333c012dc4 100644 --- a/test/functional/VM_Test/src/j9vm/test/clone/SynchronizedCloneTest.java +++ b/test/functional/VM_Test/src/j9vm/test/clone/SynchronizedCloneTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.clone; diff --git a/test/functional/VM_Test/src/j9vm/test/daemon/Daemon.java b/test/functional/VM_Test/src/j9vm/test/daemon/Daemon.java index 4f61e47b729..1f75cc54eeb 100644 --- a/test/functional/VM_Test/src/j9vm/test/daemon/Daemon.java +++ b/test/functional/VM_Test/src/j9vm/test/daemon/Daemon.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.daemon; diff --git a/test/functional/VM_Test/src/j9vm/test/daemon/DaemonCrashTest.java b/test/functional/VM_Test/src/j9vm/test/daemon/DaemonCrashTest.java index 315c18b3a23..cb8c2c0dc33 100644 --- a/test/functional/VM_Test/src/j9vm/test/daemon/DaemonCrashTest.java +++ b/test/functional/VM_Test/src/j9vm/test/daemon/DaemonCrashTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.daemon; diff --git a/test/functional/VM_Test/src/j9vm/test/hash/ArrayHashCodeTest.java b/test/functional/VM_Test/src/j9vm/test/hash/ArrayHashCodeTest.java index 012e6dadc3a..fd7af20aba6 100644 --- a/test/functional/VM_Test/src/j9vm/test/hash/ArrayHashCodeTest.java +++ b/test/functional/VM_Test/src/j9vm/test/hash/ArrayHashCodeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 9, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/hash/CloneHashCodeTest.java b/test/functional/VM_Test/src/j9vm/test/hash/CloneHashCodeTest.java index bc745b956e2..37c7f8ac9d6 100644 --- a/test/functional/VM_Test/src/j9vm/test/hash/CloneHashCodeTest.java +++ b/test/functional/VM_Test/src/j9vm/test/hash/CloneHashCodeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 9, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeDistributionTest.java b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeDistributionTest.java index 27dcf48c778..4cf2bab4526 100644 --- a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeDistributionTest.java +++ b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeDistributionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 9, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTest.java b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTest.java index 3e27f159e57..2670f5063bc 100644 --- a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTest.java +++ b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 9, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTestParent.java b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTestParent.java index 3f059859af0..0c6ddaf0007 100644 --- a/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTestParent.java +++ b/test/functional/VM_Test/src/j9vm/test/hash/HashCodeTestParent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 9, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/hash/ManyHashCodeTest.java b/test/functional/VM_Test/src/j9vm/test/hash/ManyHashCodeTest.java index 9a596e31658..87831e86117 100644 --- a/test/functional/VM_Test/src/j9vm/test/hash/ManyHashCodeTest.java +++ b/test/functional/VM_Test/src/j9vm/test/hash/ManyHashCodeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 9, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/innerclass/InnerClassTest.java b/test/functional/VM_Test/src/j9vm/test/innerclass/InnerClassTest.java index 5fc32be5597..00c2fd48901 100644 --- a/test/functional/VM_Test/src/j9vm/test/innerclass/InnerClassTest.java +++ b/test/functional/VM_Test/src/j9vm/test/innerclass/InnerClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.innerclass; diff --git a/test/functional/VM_Test/src/j9vm/test/instancedescription/InstanceDescriptionTest.java b/test/functional/VM_Test/src/j9vm/test/instancedescription/InstanceDescriptionTest.java index 3c0ca2d942c..3bf2beb6da6 100644 --- a/test/functional/VM_Test/src/j9vm/test/instancedescription/InstanceDescriptionTest.java +++ b/test/functional/VM_Test/src/j9vm/test/instancedescription/InstanceDescriptionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jul 12, 2004 diff --git a/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/ClassGenerator.java b/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/ClassGenerator.java index 7a29443ac8e..9156580e760 100644 --- a/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/ClassGenerator.java +++ b/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.intermediateclasscreate; diff --git a/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTest.java b/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTest.java index 6042598b840..ad0be8369bc 100644 --- a/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTest.java +++ b/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.intermediateclasscreate; diff --git a/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTestRunner.java b/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTestRunner.java index 8aa94bbf9cd..5de87f4af9b 100644 --- a/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/intermediateclasscreate/IntermediateClassCreateTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.intermediateclasscreate; diff --git a/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTest.java b/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTest.java index b39fdbca74e..f725bf348f0 100644 --- a/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTest.java +++ b/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.invalidclasspath; diff --git a/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTestRunner.java b/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTestRunner.java index c9a6b335d88..6ef53c23a00 100644 --- a/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/invalidclasspath/SetClasspathTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.invalidclasspath; diff --git a/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTest.java b/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTest.java index a2f97a018be..2157065e70f 100644 --- a/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jarfileupdate; diff --git a/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTestRunner.java b/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTestRunner.java index 29a2fdad1b2..d435f40961a 100644 --- a/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/jarfileupdate/JarFileUpdateTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jarfileupdate; diff --git a/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTest.java b/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTest.java index ba875fcf1f4..8d70aa08ded 100644 --- a/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTest.java +++ b/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.javahome; diff --git a/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTestRunner.java b/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTestRunner.java index 88451b68905..612f1072c64 100644 --- a/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/javahome/JavaHomeTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.javahome; diff --git a/test/functional/VM_Test/src/j9vm/test/jni/CriticalRegionTest.java b/test/functional/VM_Test/src/j9vm/test/jni/CriticalRegionTest.java index b26ebc83f2f..d51119e96e8 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/CriticalRegionTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/CriticalRegionTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/VM_Test/src/j9vm/test/jni/GetObjectRefTypeTest.java b/test/functional/VM_Test/src/j9vm/test/jni/GetObjectRefTypeTest.java index 6cfb408de9d..069cd05cb4a 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/GetObjectRefTypeTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/GetObjectRefTypeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Nov 7, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/jni/JNIFloatTest.java b/test/functional/VM_Test/src/j9vm/test/jni/JNIFloatTest.java index 8273d9bd6fd..bdc8df32c97 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/JNIFloatTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/JNIFloatTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/VM_Test/src/j9vm/test/jni/LazyLinkTest.java b/test/functional/VM_Test/src/j9vm/test/jni/LazyLinkTest.java index 819e12c5377..14792916b7a 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/LazyLinkTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/LazyLinkTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/VM_Test/src/j9vm/test/jni/LocalRefTest.java b/test/functional/VM_Test/src/j9vm/test/jni/LocalRefTest.java index aeb0377181f..a2996bb83a7 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/LocalRefTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/LocalRefTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/VM_Test/src/j9vm/test/jni/NullRefTest.java b/test/functional/VM_Test/src/j9vm/test/jni/NullRefTest.java index ea8c53cf6ac..f9b5cd5439a 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/NullRefTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/NullRefTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jni; diff --git a/test/functional/VM_Test/src/j9vm/test/jni/VolatileTest.java b/test/functional/VM_Test/src/j9vm/test/jni/VolatileTest.java index ffe95b1fc0c..0ef25b6d2e7 100644 --- a/test/functional/VM_Test/src/j9vm/test/jni/VolatileTest.java +++ b/test/functional/VM_Test/src/j9vm/test/jni/VolatileTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on May 2, 2005 diff --git a/test/functional/VM_Test/src/j9vm/test/libraryhandle/LibHandleTest_Disabled.java b/test/functional/VM_Test/src/j9vm/test/libraryhandle/LibHandleTest_Disabled.java index 357b2f7c95f..bae79e87923 100644 --- a/test/functional/VM_Test/src/j9vm/test/libraryhandle/LibHandleTest_Disabled.java +++ b/test/functional/VM_Test/src/j9vm/test/libraryhandle/LibHandleTest_Disabled.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.libraryhandle; diff --git a/test/functional/VM_Test/src/j9vm/test/libraryhandle/MultipleLibraryLoadTest.java b/test/functional/VM_Test/src/j9vm/test/libraryhandle/MultipleLibraryLoadTest.java index de845083f26..93eccc81fd7 100644 --- a/test/functional/VM_Test/src/j9vm/test/libraryhandle/MultipleLibraryLoadTest.java +++ b/test/functional/VM_Test/src/j9vm/test/libraryhandle/MultipleLibraryLoadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.libraryhandle; diff --git a/test/functional/VM_Test/src/j9vm/test/monitor/CancelDeadThreadTest.java b/test/functional/VM_Test/src/j9vm/test/monitor/CancelDeadThreadTest.java index 4dce28a98f5..3044400c704 100644 --- a/test/functional/VM_Test/src/j9vm/test/monitor/CancelDeadThreadTest.java +++ b/test/functional/VM_Test/src/j9vm/test/monitor/CancelDeadThreadTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/monitor/CancelTest.java b/test/functional/VM_Test/src/j9vm/test/monitor/CancelTest.java index f01fa78afb3..dc369143682 100644 --- a/test/functional/VM_Test/src/j9vm/test/monitor/CancelTest.java +++ b/test/functional/VM_Test/src/j9vm/test/monitor/CancelTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/monitor/EnterExitTest.java b/test/functional/VM_Test/src/j9vm/test/monitor/EnterExitTest.java index 6112b7ee5c2..59bdb2172ac 100644 --- a/test/functional/VM_Test/src/j9vm/test/monitor/EnterExitTest.java +++ b/test/functional/VM_Test/src/j9vm/test/monitor/EnterExitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/monitor/Helpers.java b/test/functional/VM_Test/src/j9vm/test/monitor/Helpers.java index ffae4c62848..72e6313fdbe 100644 --- a/test/functional/VM_Test/src/j9vm/test/monitor/Helpers.java +++ b/test/functional/VM_Test/src/j9vm/test/monitor/Helpers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/monitor/IllegalMonitorStateTest.java b/test/functional/VM_Test/src/j9vm/test/monitor/IllegalMonitorStateTest.java index 050b98a5dbd..2cc045148f9 100644 --- a/test/functional/VM_Test/src/j9vm/test/monitor/IllegalMonitorStateTest.java +++ b/test/functional/VM_Test/src/j9vm/test/monitor/IllegalMonitorStateTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/monitor/JNITest.java b/test/functional/VM_Test/src/j9vm/test/monitor/JNITest.java index 959db4293a3..b716716bf42 100644 --- a/test/functional/VM_Test/src/j9vm/test/monitor/JNITest.java +++ b/test/functional/VM_Test/src/j9vm/test/monitor/JNITest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 6, 2006 diff --git a/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicTestGenerator.java b/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicTestGenerator.java index b621884b4fa..f1ae33fe102 100644 --- a/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicTestGenerator.java +++ b/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.multipleorphans; diff --git a/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTest.java b/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTest.java index bcc76dbc168..17c75c0a641 100644 --- a/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTest.java +++ b/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.multipleorphans; diff --git a/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTestRunner.java b/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTestRunner.java index c0bd1446f8c..89facf25fb3 100644 --- a/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/multipleorphans/InvokeDynamicWithMultipleOrphanComparisonTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.multipleorphans; diff --git a/test/functional/VM_Test/src/j9vm/test/multivm/MultiVMFibTest.java b/test/functional/VM_Test/src/j9vm/test/multivm/MultiVMFibTest.java index 6f737bee7d0..08225ce72be 100644 --- a/test/functional/VM_Test/src/j9vm/test/multivm/MultiVMFibTest.java +++ b/test/functional/VM_Test/src/j9vm/test/multivm/MultiVMFibTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.multivm; diff --git a/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTest.java b/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTest.java index 4dab0b7166e..1d4bd42edb4 100644 --- a/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTest.java +++ b/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.management.GarbageCollectorMXBean; diff --git a/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTestRunner.java b/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTestRunner.java index d7ceb3adf25..2c4a85702e8 100644 --- a/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/mxbeans/MXBeansGetterSanityTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.mxbeans; diff --git a/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTest.java b/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTest.java index 8883150738e..8e0688535f7 100644 --- a/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTest.java +++ b/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.nestedJar; diff --git a/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTestRunner.java b/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTestRunner.java index aec99d034f9..e69fe2144fc 100644 --- a/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/nestedjar/NestedJarFileTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.nestedJar; diff --git a/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTest.java b/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTest.java index 46bc129227e..3a94644e4ce 100644 --- a/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTest.java +++ b/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Jun 13, 2007 diff --git a/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTestRunner.java b/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTestRunner.java index e6c4fd120d1..7d3750c780d 100644 --- a/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/ref/SoftReferenceAgingTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.ref; diff --git a/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTest.java b/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTest.java index 4c7be38df3b..38c4eb89f86 100644 --- a/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTest.java +++ b/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTestRunner.java b/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTestRunner.java index ec165850745..2ba684a262b 100644 --- a/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/romclasscreation/NewROMCreationAfterModifyingExistingClassTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.romclasscreation; diff --git a/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTest.java b/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTest.java index 850b9ce2bbd..ca7384a90a1 100644 --- a/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTest.java +++ b/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.*; diff --git a/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTestRunner.java b/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTestRunner.java index 46f7c25f63b..7793fc6b3a2 100644 --- a/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/romclasscreation/OrphanROMHashTableDeletionTestRunner.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import j9vm.runner.Runner; diff --git a/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTest.java b/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTest.java index 7135211ff10..17b9b684dd1 100644 --- a/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTest.java +++ b/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTestRunner.java b/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTestRunner.java index 5e6b53653aa..818b48760f3 100644 --- a/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/romclasscreation/ROMRetentionAfterRAMFailureTestRunner.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import j9vm.runner.Runner; diff --git a/test/functional/VM_Test/src/j9vm/test/runtime/RuntimeMemoryTest.java b/test/functional/VM_Test/src/j9vm/test/runtime/RuntimeMemoryTest.java index b9fb74f69b2..e512905e384 100644 --- a/test/functional/VM_Test/src/j9vm/test/runtime/RuntimeMemoryTest.java +++ b/test/functional/VM_Test/src/j9vm/test/runtime/RuntimeMemoryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.runtime; diff --git a/test/functional/VM_Test/src/j9vm/test/stackoverflow/StackOverflowTest.java b/test/functional/VM_Test/src/j9vm/test/stackoverflow/StackOverflowTest.java index d9056d55d15..d6e388154f8 100644 --- a/test/functional/VM_Test/src/j9vm/test/stackoverflow/StackOverflowTest.java +++ b/test/functional/VM_Test/src/j9vm/test/stackoverflow/StackOverflowTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.stackoverflow; diff --git a/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTest.java b/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTest.java index 6f9a82d5505..e5e93f49b45 100644 --- a/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTest.java +++ b/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.terminate; diff --git a/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTestRunner.java b/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTestRunner.java index 6ca7e2bddad..d779acf6409 100644 --- a/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/terminate/TerminateTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.terminate; import java.io.*; diff --git a/test/functional/VM_Test/src/j9vm/test/thread/FindDeadlockTest.java b/test/functional/VM_Test/src/j9vm/test/thread/FindDeadlockTest.java index ca609871c16..974943f9d11 100644 --- a/test/functional/VM_Test/src/j9vm/test/thread/FindDeadlockTest.java +++ b/test/functional/VM_Test/src/j9vm/test/thread/FindDeadlockTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.thread; diff --git a/test/functional/VM_Test/src/j9vm/test/thread/InterruptNotifyWaitTest.java b/test/functional/VM_Test/src/j9vm/test/thread/InterruptNotifyWaitTest.java index 5421b2da0f6..b029691ceb2 100644 --- a/test/functional/VM_Test/src/j9vm/test/thread/InterruptNotifyWaitTest.java +++ b/test/functional/VM_Test/src/j9vm/test/thread/InterruptNotifyWaitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.thread; diff --git a/test/functional/VM_Test/src/j9vm/test/thread/NativeHelpers.java b/test/functional/VM_Test/src/j9vm/test/thread/NativeHelpers.java index 1f70b9a6ff7..4953df2f97f 100644 --- a/test/functional/VM_Test/src/j9vm/test/thread/NativeHelpers.java +++ b/test/functional/VM_Test/src/j9vm/test/thread/NativeHelpers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.thread; diff --git a/test/functional/VM_Test/src/j9vm/test/thread/NativePriorityTest.java b/test/functional/VM_Test/src/j9vm/test/thread/NativePriorityTest.java index 01262f0df42..94c45bcf856 100644 --- a/test/functional/VM_Test/src/j9vm/test/thread/NativePriorityTest.java +++ b/test/functional/VM_Test/src/j9vm/test/thread/NativePriorityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.thread; diff --git a/test/functional/VM_Test/src/j9vm/test/thread/SchedulingTest.java b/test/functional/VM_Test/src/j9vm/test/thread/SchedulingTest.java index 75ac34867a3..b9e028bc4a6 100644 --- a/test/functional/VM_Test/src/j9vm/test/thread/SchedulingTest.java +++ b/test/functional/VM_Test/src/j9vm/test/thread/SchedulingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.thread; diff --git a/test/functional/VM_Test/src/j9vm/test/thread/TestNatives.java b/test/functional/VM_Test/src/j9vm/test/thread/TestNatives.java index 28470396b0e..7b4bb4141e3 100644 --- a/test/functional/VM_Test/src/j9vm/test/thread/TestNatives.java +++ b/test/functional/VM_Test/src/j9vm/test/thread/TestNatives.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class TestNatives { diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1Test.java index c8ef60b6676..2d81369bb21 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1bTest.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1bTest.java index d0d1fe66d88..8da82bcd39f 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1bTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario1bTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2Test.java index 85573481803..bae2fdd306d 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2bTest.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2bTest.java index 9db3ed909da..0b5905a99df 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2bTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario2bTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3Test.java index 2596c955d63..9332cfa06da 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3bTest.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3bTest.java index f6382f29ff2..43682a901ea 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3bTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario3bTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4Test.java index ce684848949..16efd253978 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4bTest.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4bTest.java index 96853b8e0ef..a95c6df7c0f 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4bTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4bTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4cTest.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4cTest.java index ebed9016c4b..3110219a1da 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4cTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario4cTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario5Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario5Test.java index 43962f0ad3f..882cf399227 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario5Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario5Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario6Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario6Test.java index 060ef1a0ca4..19f87bdbdf3 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario6Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario6Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario7Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario7Test.java index 3e4c3bd94f8..774a41afd0f 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario7Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario7Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario8Test.java b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario8Test.java index fa5821833b8..346af37225d 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario8Test.java +++ b/test/functional/VM_Test/src/j9vm/test/threadinterrupt/scenario8Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadinterrupt; diff --git a/test/functional/VM_Test/src/j9vm/test/threadname/ASCIIThreadNameTest.java b/test/functional/VM_Test/src/j9vm/test/threadname/ASCIIThreadNameTest.java index 50d67d506c8..a82d96a6409 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadname/ASCIIThreadNameTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadname/ASCIIThreadNameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadname; diff --git a/test/functional/VM_Test/src/j9vm/test/threadname/ControlCharacterThreadNameTest.java b/test/functional/VM_Test/src/j9vm/test/threadname/ControlCharacterThreadNameTest.java index c6963edddc0..54da52d5fc2 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadname/ControlCharacterThreadNameTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadname/ControlCharacterThreadNameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threadname; diff --git a/test/functional/VM_Test/src/j9vm/test/threadname/UnicodeThreadNameTest.java b/test/functional/VM_Test/src/j9vm/test/threadname/UnicodeThreadNameTest.java index 85e78f8efeb..e5447882614 100644 --- a/test/functional/VM_Test/src/j9vm/test/threadname/UnicodeThreadNameTest.java +++ b/test/functional/VM_Test/src/j9vm/test/threadname/UnicodeThreadNameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * See defect 97658 diff --git a/test/functional/VM_Test/src/j9vm/test/threads/regression/ProcessWaitFor.java b/test/functional/VM_Test/src/j9vm/test/threads/regression/ProcessWaitFor.java index bfb138c6867..1c678dfb67f 100644 --- a/test/functional/VM_Test/src/j9vm/test/threads/regression/ProcessWaitFor.java +++ b/test/functional/VM_Test/src/j9vm/test/threads/regression/ProcessWaitFor.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/j9vm/test/threads/regression/RegressionTests.java b/test/functional/VM_Test/src/j9vm/test/threads/regression/RegressionTests.java index dca07542673..1aa4b956fa1 100644 --- a/test/functional/VM_Test/src/j9vm/test/threads/regression/RegressionTests.java +++ b/test/functional/VM_Test/src/j9vm/test/threads/regression/RegressionTests.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import junit.framework.Test; diff --git a/test/functional/VM_Test/src/j9vm/test/threads/regression/Sleeper.java b/test/functional/VM_Test/src/j9vm/test/threads/regression/Sleeper.java index 52debe69665..e3a53686dd4 100644 --- a/test/functional/VM_Test/src/j9vm/test/threads/regression/Sleeper.java +++ b/test/functional/VM_Test/src/j9vm/test/threads/regression/Sleeper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.threads.regression; diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/AllocateTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/AllocateTest.java index de63b2da9e9..ed2c039ebc4 100644 --- a/test/functional/VM_Test/src/j9vm/test/unsafe/AllocateTest.java +++ b/test/functional/VM_Test/src/j9vm/test/unsafe/AllocateTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.unsafe; diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeAccessorTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeAccessorTest.java index 091bed4012e..1e68687ff7a 100644 --- a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeAccessorTest.java +++ b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeAccessorTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.unsafe; diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeArrayGetTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeArrayGetTest.java index d078427c8a9..1f2d017c8eb 100644 --- a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeArrayGetTest.java +++ b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeArrayGetTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.unsafe; diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeCopyMemoryTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeCopyMemoryTest.java index cb031c6e6f7..41dfbd9b4e9 100644 --- a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeCopyMemoryTest.java +++ b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeCopyMemoryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.unsafe; diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeObjectGetTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeObjectGetTest.java index 5c3b4c5bc37..d0607ac6080 100644 --- a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeObjectGetTest.java +++ b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeObjectGetTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.unsafe; diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeSetMemoryTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeSetMemoryTest.java index 5390fca796e..f81e3729e83 100644 --- a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeSetMemoryTest.java +++ b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeSetMemoryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.unsafe; diff --git a/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTest.java b/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTest.java index 4c5cc810d40..951ff7d3cd6 100644 --- a/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTest.java +++ b/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.xlp; diff --git a/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTestRunner.java b/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTestRunner.java index 3499b16733c..7b6ce314bcc 100644 --- a/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/xlp/XlpOptionsTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.xlp; diff --git a/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTest.java b/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTest.java index 1837b829b23..399f0c86a8d 100644 --- a/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTest.java +++ b/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.xlpcodecache; diff --git a/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTestRunner.java b/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTestRunner.java index f139d2b82fa..14c8ea6ce0c 100644 --- a/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTestRunner.java +++ b/test/functional/VM_Test/src/j9vm/test/xlpcodecache/XlpCodeCacheOptionsTestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.xlpcodecache; diff --git a/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpOption.java b/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpOption.java index 4dfb32f4ce1..2e741ccb0e3 100644 --- a/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpOption.java +++ b/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpOption.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.xlphelper; diff --git a/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpUtil.java b/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpUtil.java index e00f8423488..f7d01758e3b 100644 --- a/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpUtil.java +++ b/test/functional/VM_Test/src/j9vm/test/xlphelper/XlpUtil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.xlphelper; diff --git a/test/functional/Valhalla/README.md b/test/functional/Valhalla/README.md index e58b7e1beea..36a40c55ed1 100644 --- a/test/functional/Valhalla/README.md +++ b/test/functional/Valhalla/README.md @@ -17,7 +17,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> # Valhalla Test diff --git a/test/functional/Valhalla/build.xml b/test/functional/Valhalla/build.xml index 5d9b058ad4d..4389f3b9d8b 100644 --- a/test/functional/Valhalla/build.xml +++ b/test/functional/Valhalla/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Valhalla/playlist.xml b/test/functional/Valhalla/playlist.xml index 2f0410c42df..7f5f28a9b44 100644 --- a/test/functional/Valhalla/playlist.xml +++ b/test/functional/Valhalla/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/DDRBackfillLayoutTest.java b/test/functional/Valhalla/src/org/openj9/test/lworld/DDRBackfillLayoutTest.java index 2549457bf64..432598a84f6 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/DDRBackfillLayoutTest.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/DDRBackfillLayoutTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/DDRValueTypeTest.java b/test/functional/Valhalla/src/org/openj9/test/lworld/DDRValueTypeTest.java index 0b11d44accd..896fe764a67 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/DDRValueTypeTest.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/DDRValueTypeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeArrayTests.java b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeArrayTests.java index cf1fedef084..c5e998157ce 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeArrayTests.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeArrayTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeGenerator.java b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeGenerator.java index b8c87f08c23..b6cac79aba7 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeGenerator.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTestClasses.java b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTestClasses.java index f820694a543..604aea61e7d 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTestClasses.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTestClasses.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTests.java b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTests.java index e8f2b7279ea..c56004069e0 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTests.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeUnsafeTests.java b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeUnsafeTests.java index 7414c15ddcf..f195ab03490 100644 --- a/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeUnsafeTests.java +++ b/test/functional/Valhalla/src/org/openj9/test/lworld/ValueTypeUnsafeTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lworld; diff --git a/test/functional/Valhalla/testng.xml b/test/functional/Valhalla/testng.xml index a0ab706d060..e90a3081b86 100644 --- a/test/functional/Valhalla/testng.xml +++ b/test/functional/Valhalla/testng.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/build.xml b/test/functional/build.xml index 23d749822ad..150aa0246c7 100644 --- a/test/functional/build.xml +++ b/test/functional/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/.classpath b/test/functional/cmdLineTests/CDSAdaptorTest/.classpath index 0604f0e737b..303eb28bf36 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/.classpath +++ b/test/functional/cmdLineTests/CDSAdaptorTest/.classpath @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ --> diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/build.xml b/test/functional/cmdLineTests/CDSAdaptorTest/build.xml index ebd86315e3c..af79c2344dd 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/build.xml +++ b/test/functional/cmdLineTests/CDSAdaptorTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/cdsadaptortest.xml b/test/functional/cmdLineTests/CDSAdaptorTest/cdsadaptortest.xml index 6e26b47b03f..78733939d96 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/cdsadaptortest.xml +++ b/test/functional/cmdLineTests/CDSAdaptorTest/cdsadaptortest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/playlist.xml b/test/functional/cmdLineTests/CDSAdaptorTest/playlist.xml index 31e4b865788..538a843c128 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/playlist.xml +++ b/test/functional/cmdLineTests/CDSAdaptorTest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/readme.txt b/test/functional/cmdLineTests/CDSAdaptorTest/readme.txt index 165c483a0d9..01f6c6a5f9a 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/readme.txt +++ b/test/functional/cmdLineTests/CDSAdaptorTest/readme.txt @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* This test suite is the place holder for adding CDS Adaptor tests. diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/CDSAdaptorOrphanTestBundles/readme.txt b/test/functional/cmdLineTests/CDSAdaptorTest/resources/CDSAdaptorOrphanTestBundles/readme.txt index 003cf075049..5d9134d9791 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/CDSAdaptorOrphanTestBundles/readme.txt +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/CDSAdaptorOrphanTestBundles/readme.txt @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* This folder is used as the testBundleLocation. \ No newline at end of file diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/FrameworkBundles/readme.txt b/test/functional/cmdLineTests/CDSAdaptorTest/resources/FrameworkBundles/readme.txt index 0bbc6f65580..20a011b6ff3 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/FrameworkBundles/readme.txt +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/FrameworkBundles/readme.txt @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* This folder is used as the frameworkBundleLocation. \ No newline at end of file diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/MANIFEST.MF b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/MANIFEST.MF index b2844a5d08b..d590fec2cff 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/MANIFEST.MF +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/MANIFEST.MF @@ -12,7 +12,7 @@ Comment: Copyright IBM Corp. and others 2001 OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Manifest-Version: 1.0 Bundle-Vendor: IBM Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/Activator.java b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/Activator.java index c7d1b2ea5e3..c5a38a7b203 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/Activator.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/Activator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.testbundle; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV1.java b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV1.java index 5091e0e490a..53b5770a95d 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV1.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.testbundle; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV2.java b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV2.java index 7ac3114219c..8c2641706f9 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV2.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/TestBundle/src/org/openj9/test/testbundle/SomeMessageV2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.testbundle; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/MANIFEST.MF b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/MANIFEST.MF index 0ab3a522212..d15d2f56a72 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/MANIFEST.MF +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/MANIFEST.MF @@ -12,7 +12,7 @@ Comment: Copyright IBM Corp. and others 2001 OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 Manifest-Version: 1.0 Bundle-Vendor: IBM Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Activator.java b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Activator.java index 1116ff89bab..20d39b4ff67 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Activator.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Activator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.weavinghooktest; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Util.java b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Util.java index 45ab5bd5c3b..e81e4b0096e 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Util.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/Util.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.weavinghooktest; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/WeavingHookImpl.java b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/WeavingHookImpl.java index 7c36e72dc28..c402daf5f7a 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/WeavingHookImpl.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/WeavinghookTest/src/org/openj9/test/weavinghooktest/WeavingHookImpl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.weavinghooktest; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/resources/readme.txt b/test/functional/cmdLineTests/CDSAdaptorTest/resources/readme.txt index 642028cca61..6c4ccca1e6b 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/resources/readme.txt +++ b/test/functional/cmdLineTests/CDSAdaptorTest/resources/readme.txt @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* This file explains the working of org.openj9.test.cdsadaptortest.CDSAdaptorOrphanTest.java diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/CDSAdaptorOrphanTest.java b/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/CDSAdaptorOrphanTest.java index 3062d987489..5b0eee9e90f 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/CDSAdaptorOrphanTest.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/CDSAdaptorOrphanTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.cdsadaptortest; diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/OSGiFrameworkLauncher.java b/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/OSGiFrameworkLauncher.java index 62ba353f50a..b1ba48c0e06 100644 --- a/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/OSGiFrameworkLauncher.java +++ b/test/functional/cmdLineTests/CDSAdaptorTest/src/org/openj9/test/cdsadaptortest/OSGiFrameworkLauncher.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.cdsadaptortest; diff --git a/test/functional/cmdLineTests/J9security/build.xml b/test/functional/cmdLineTests/J9security/build.xml index b85771ab410..49272fb37bb 100644 --- a/test/functional/cmdLineTests/J9security/build.xml +++ b/test/functional/cmdLineTests/J9security/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/J9security/j9SecurityTest.xml b/test/functional/cmdLineTests/J9security/j9SecurityTest.xml index 464fb07cf82..5e58c60f69d 100644 --- a/test/functional/cmdLineTests/J9security/j9SecurityTest.xml +++ b/test/functional/cmdLineTests/J9security/j9SecurityTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/J9security/jsr292.policy b/test/functional/cmdLineTests/J9security/jsr292.policy index a6f37eecdcf..7902b493083 100644 --- a/test/functional/cmdLineTests/J9security/jsr292.policy +++ b/test/functional/cmdLineTests/J9security/jsr292.policy @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ grant { diff --git a/test/functional/cmdLineTests/J9security/playlist.xml b/test/functional/cmdLineTests/J9security/playlist.xml index e5dd8bf4f51..b57c9f4cbda 100644 --- a/test/functional/cmdLineTests/J9security/playlist.xml +++ b/test/functional/cmdLineTests/J9security/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/CodeTrusted.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/CodeTrusted.java index 14e9aab5b11..74eaa4ffe88 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/CodeTrusted.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/CodeTrusted.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jep140; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/JEP140Tests.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/JEP140Tests.java index b9a8a652be8..924c1252794 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/JEP140Tests.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jep140/JEP140Tests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jep140; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/TestJSR292.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/TestJSR292.java index ac5d15f09b8..da1cf9b81e2 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/TestJSR292.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/TestJSR292.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/bootpath/CodeNotTrusted.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/bootpath/CodeNotTrusted.java index f25df65ed5e..c705da49c34 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/bootpath/CodeNotTrusted.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/jsr292/indyn/bootpath/CodeNotTrusted.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.jsr292.indyn.bootpath; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/PR66930ACCcheckPermission.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/PR66930ACCcheckPermission.java index b2332c56894..6c437f1fa57 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/PR66930ACCcheckPermission.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/PR66930ACCcheckPermission.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.security; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestACdoPrivilegedWithCombiner.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestACdoPrivilegedWithCombiner.java index e5adde0fa6f..45122c053c4 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestACdoPrivilegedWithCombiner.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestACdoPrivilegedWithCombiner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.security; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestImplies.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestImplies.java index ef0794a57ba..85fd2ef57d2 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestImplies.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestImplies.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.security; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestOpenJ9GPUPermissions.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestOpenJ9GPUPermissions.java index f111e0caaf9..ed168e31413 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestOpenJ9GPUPermissions.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestOpenJ9GPUPermissions.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.security; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestToArrayOfProtectionDomains.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestToArrayOfProtectionDomains.java index a4efe05c8c1..e973aeed152 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestToArrayOfProtectionDomains.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/TestToArrayOfProtectionDomains.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.security; diff --git a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/bootpath/CodeTrusted.java b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/bootpath/CodeTrusted.java index 8723b66ed0b..55f114f74de 100644 --- a/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/bootpath/CodeTrusted.java +++ b/test/functional/cmdLineTests/J9security/src/com/ibm/j9/security/bootpath/CodeTrusted.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.security.bootpath; diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/build.xml b/test/functional/cmdLineTests/SystemPropertiesTest/build.xml index 893d9bed31b..6007722bd89 100644 --- a/test/functional/cmdLineTests/SystemPropertiesTest/build.xml +++ b/test/functional/cmdLineTests/SystemPropertiesTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/playlist.xml b/test/functional/cmdLineTests/SystemPropertiesTest/playlist.xml index a15f7a86222..ddc94a0eac7 100644 --- a/test/functional/cmdLineTests/SystemPropertiesTest/playlist.xml +++ b/test/functional/cmdLineTests/SystemPropertiesTest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropRepeatDefinesTest.java b/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropRepeatDefinesTest.java index 83308edec8e..58944710fb4 100644 --- a/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropRepeatDefinesTest.java +++ b/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropRepeatDefinesTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class SysPropRepeatDefinesTest { diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropTest.java b/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropTest.java index dd61eeec8bf..ac41649e847 100644 --- a/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropTest.java +++ b/test/functional/cmdLineTests/SystemPropertiesTest/src/SysPropTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.*; diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/sysproprepeatdefinestest.xml b/test/functional/cmdLineTests/SystemPropertiesTest/sysproprepeatdefinestest.xml index 76070f55866..6cc01ab8d67 100644 --- a/test/functional/cmdLineTests/SystemPropertiesTest/sysproprepeatdefinestest.xml +++ b/test/functional/cmdLineTests/SystemPropertiesTest/sysproprepeatdefinestest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/syspropstest.xml b/test/functional/cmdLineTests/SystemPropertiesTest/syspropstest.xml index 1abe73ec9de..04bcfad1113 100644 --- a/test/functional/cmdLineTests/SystemPropertiesTest/syspropstest.xml +++ b/test/functional/cmdLineTests/SystemPropertiesTest/syspropstest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/FindStore_win.xml b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/FindStore_win.xml index d276bdc170c..ea0d2ec562b 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/FindStore_win.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/FindStore_win.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/A_Main.java index 87cc80bee03..f8d46c79279 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/B_Dummy.java index f5f3d1c952c..66a7c986e8a 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/C_Dummy.java index 2b96b591c5f..d10754e12ba 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/D_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/D_Dummy.java index 18d45db6116..b30b94203ba 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/D_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/D_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/E_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/E_Main.java index 25f4bd38b9d..91efec8c926 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/E_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/E_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/F_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/F_Dummy.java index 9fa3a68e4fb..f292dfaac4f 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/F_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/F_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/G_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/G_Dummy.java index b3cf0892cd8..7e8145785dc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/G_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/G_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/H_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/H_Dummy.java index 62fca9cea58..18b32985f1f 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/H_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/H_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/I_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/I_Main.java index 6d83c9f1511..8ffdb8bbb74 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/I_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/I_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/J_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/J_Dummy.java index a2786ad395f..6748dd10569 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/J_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/J_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/K_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/K_Dummy.java index 970537072f2..f0eba1644cd 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/K_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/K_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/L_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/L_Dummy.java index 354e26e7b35..59c88393252 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/L_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/L_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/M_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/M_Main.java index 0b3f809945e..459af185e02 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/M_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/M_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/N_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/N_Dummy.java index 343337459be..c7814184a38 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/N_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/N_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/O_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/O_Dummy.java index 0fa575ad114..18dd9e635dc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/O_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/O_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/P_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/P_Dummy.java index e4cd6c86240..35591d724ce 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/P_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/VerifyClasses/jnurlcldr/shared/findstore/P_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.bat b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.bat index 305c0bdc0b8..07af32f5a85 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd FindStore diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.sh b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.sh index 9bef7b1287b..bcfd246dca7 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildInitial.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd FindStore diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.bat b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.bat index c6540e87712..8060dbcabcc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd FindStore diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.sh b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.sh index 4305f849dbd..28f7d48b50b 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/buildVerify.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new jar files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/A_Main.java index c4613658956..4d5365ee0bf 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/B_Dummy.java index 8f26a53d364..c79185b93ac 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/C_Dummy.java index 83c76b9517d..ad5b2487ed6 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/D_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/D_Dummy.java index 6ef8ea75a42..3f7a3b8d03b 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/D_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/D_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/E_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/E_Main.java index 4bf787fe0f5..b16f57758ef 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/E_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/E_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/F_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/F_Dummy.java index d9fdd78e306..2da67f63e1e 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/F_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/F_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/G_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/G_Dummy.java index 975dc83ee74..b56ffc157ce 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/G_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/G_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/H_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/H_Dummy.java index 9d015a1b15f..70984d5eddb 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/H_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/H_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/I_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/I_Main.java index df56217d3bb..29280b8ba69 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/I_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/I_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/J_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/J_Dummy.java index f5a5d0c8af0..fcb06645901 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/J_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/J_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/K_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/K_Dummy.java index 9ccd7341f17..e733a282357 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/K_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/K_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/L_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/L_Dummy.java index 34d353071b5..032772d2d8c 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/L_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/L_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/M_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/M_Main.java index b7692623ab9..2d4d90265e9 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/M_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/M_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/N_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/N_Dummy.java index fb7c38a0438..dd879b1cfbd 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/N_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/N_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/O_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/O_Dummy.java index b8e9581f862..3ad1532e4ea 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/O_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/O_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/P_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/P_Dummy.java index e82720331bc..513c35a3c87 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/P_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/jnurlcldr/shared/findstore/P_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.findstore; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/readme.txt b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/readme.txt index d127d4ef059..9014efafe1c 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/readme.txt +++ b/test/functional/cmdLineTests/URLClassLoaderTests/FindStore/readme.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # These tests check the basic find and store functionality of URLClassLoader with various different classpath configurations diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/JarExt_win.xml b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/JarExt_win.xml index c9603a45154..7271e8c9f52 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/JarExt_win.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/JarExt_win.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Data.java index e63baac651c..90f0642c829 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Main.java index f2ab027c730..b087c1f7046 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Data.java index 85ef92a4e25..f02013ddb09 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Dummy.java index 8c6277af568..005c99e3a78 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Data.java index 171ba235618..f62c6c4cd9d 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Dummy.java index 9d589fb1aaf..b80fd073dda 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Data.java index ded66d78165..1430495fbfe 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Dummy.java index 293809ed6e6..639d6bed130 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/D_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E1_Data.java index baf7c0cce93..1d9989252c1 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E_Main.java index 318e08f3aa9..1fedca447ee 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/E_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F1_Data.java index 9cbceb6fb23..215a0bdc644 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F_Data.java index aeade37b02a..1854d4b0315 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/F_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G1_Data.java index b5a8343526f..144bdaba506 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G_Data.java index 820d80bb018..ef836c090a2 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/G_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H1_Data.java index 7b9f278954e..bbb8f8089bf 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H_Data.java index f542e8651c4..743910964e4 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/VerifyClasses/jnurlcldr/shared/jarexttests/H_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.bat b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.bat index 97d6e18575b..7c157a126f3 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd JarExt diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.sh b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.sh index 1dc5f934f48..c4e6db2f3d1 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildInitial.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd JarExt diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.bat b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.bat index 0ea0e4e4316..405dfbabf8c 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd JarExt diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.sh b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.sh index 89be9b576c6..ad1a4f83b67 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildJarIndexes.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd JarExt diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.bat b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.bat index 06577366381..3857e0708fb 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new jar files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.sh b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.sh index 6090e02e6ac..80731034b94 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/buildVerify.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new jar files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Data.java index 08dc7907e68..d280607308a 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Main.java index f2ab027c730..b087c1f7046 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Data.java index 8885219e846..31da476afb4 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Dummy.java index 8c6277af568..005c99e3a78 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Data.java index a940190254d..e327e182c00 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Dummy.java index 9d589fb1aaf..b80fd073dda 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Data.java index 765857ea47a..e1a1ec4b5ec 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Dummy.java index 293809ed6e6..639d6bed130 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/D_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E1_Data.java index 5b747a9d8c7..dcfd0769338 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E_Main.java index f0232e3b636..8c5c257ab45 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/E_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F1_Data.java index 0b0a7338e56..35de4baa304 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F_Data.java index f1069a91833..04b1292bc70 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/F_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G1_Data.java index cb58ef03bb1..d35b5cf58de 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G_Data.java index 96d2e6a6b98..e367f6007ff 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/G_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H1_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H1_Data.java index 58c7571eb97..ba4174d0bcc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H1_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H1_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H_Data.java index 0587e12e004..f1c583f1832 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/jnurlcldr/shared/jarexttests/H_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.jarexttests; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/readme.txt b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/readme.txt index 99ee913b341..800e5ba7761 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/readme.txt +++ b/test/functional/cmdLineTests/URLClassLoaderTests/JarExt/readme.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # These tests check that the Jar Extension mechanisms and Jar indexing work with shared classes diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/NonExistJar_win.xml b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/NonExistJar_win.xml index 292c8cb84d3..f55adcc546a 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/NonExistJar_win.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/NonExistJar_win.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/A_Main.java index 5c548f19c70..710e55cc431 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/B_Dummy.java index 93a9d8ae77d..53f47e76e0a 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_DoesNothing.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_DoesNothing.java index deece563c88..419b36650aa 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_DoesNothing.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_DoesNothing.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_Dummy.java index 167ffdf7192..2f0d0a30c59 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/Rogue/jnurlcldr/shared/nonexistjar/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.bat b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.bat index 12eb48a456b..c8377c17673 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd NonExistJar diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.sh b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.sh index 69637e5e0f0..bc6ab188239 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial1.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd NonExistJar diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.bat b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.bat index 95cb00ede74..00be8bc2334 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd NonExistJar diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.sh b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.sh index 587d027228c..c3c68c3a3bc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/buildInitial2.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd NonExistJar diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/A_Main.java index e7f3569ff9f..96d39b86e45 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/B_Dummy.java index 3d83808fc95..944dc034143 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_DoesNothing.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_DoesNothing.java index deece563c88..419b36650aa 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_DoesNothing.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_DoesNothing.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_Dummy.java index db18cc6278e..b4222b2c1de 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/jnurlcldr/shared/nonexistjar/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.nonexistjar; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/readme.txt b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/readme.txt index 07f285f277e..e72245e57cf 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/readme.txt +++ b/test/functional/cmdLineTests/URLClassLoaderTests/NonExistJar/readme.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # These tests check that missing Jars on the classpath do not cause unexpected errors diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/Sanity_win.xml b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/Sanity_win.xml index 4259257b30b..31e6d380d1d 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/Sanity_win.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/Sanity_win.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Data.java index 2d4c7ae3aa7..0e06bacb07b 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtData.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtData.java index 3b01aa87498..63560ad5836 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtData.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtDummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtDummy.java index e9bc4391f2e..35abc61a6db 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtDummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_ExtDummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Main.java index f5e8cf7267f..4192c88be09 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/VerifyClasses/jnurlcldr/shared/sanity/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.bat b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.bat index 2fade21710a..de11d447f12 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd Sanity diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.sh b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.sh index 8cdb9ea5476..dcdf2d133b2 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildInitial.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd Sanity diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.bat b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.bat index 3db3f919570..ccf367d7419 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new jar files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.sh b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.sh index 4600188fcf3..02d986a34de 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/buildVerify.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new jar files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Data.java index 96008b3cba6..b3ef53d5d90 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtData.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtData.java index 92e867bfcee..6fcf008223b 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtData.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtDummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtDummy.java index e9bc4391f2e..35abc61a6db 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtDummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_ExtDummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Main.java index f5e8cf7267f..4192c88be09 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/jnurlcldr/shared/sanity/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.sanity; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/readme.txt b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/readme.txt index a3233853543..034e55601d6 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/readme.txt +++ b/test/functional/cmdLineTests/URLClassLoaderTests/Sanity/readme.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # These tests are designed to test the most basic functionality of URLClassLoader to ensure that the support exists and works. diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/SignedSealed_win.xml b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/SignedSealed_win.xml index b7db1496fa4..1c2d83c875e 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/SignedSealed_win.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/SignedSealed_win.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.bat b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.bat index f807b9332e2..7bd5ec5863d 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem del *.jar diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.sh b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.sh index 33315098ecf..96c1097736b 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial1.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd SignedSealed diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.bat b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.bat index 6dc640eb67d..5a985dc8e49 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem del *.jar diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.sh b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.sh index 00b8c5208fa..18f383a0c9d 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.sh +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/buildInitial2.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd SignedSealed diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Data.java index 7cb17c94466..0a73bb6bc1c 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.notsealed; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Dummy.java index 07c6241d6e5..97560005a3a 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/notsealed/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.notsealed; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Data.java index 4abbe58f3aa..e95c165e947 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.signedsealed; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Main.java b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Main.java index ce3f75b71de..80851eefc2a 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Main.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.signedsealed; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Data.java b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Data.java index 07e8d30bb19..a8c41b1c9cb 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Data.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Data.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.signedsealed; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Dummy.java b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Dummy.java index 9fb213e471a..edbe1ba3a7e 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Dummy.java +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/jnurlcldr/shared/signedsealed/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package jnurlcldr.shared.signedsealed; diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/readme.txt b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/readme.txt index 8d26082ca8a..cfee0dde8a6 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/readme.txt +++ b/test/functional/cmdLineTests/URLClassLoaderTests/SignedSealed/readme.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # These tests ensure that package sealing and Jar signing work correctly for shared classes diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests.xml b/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests.xml index 7eda597dd14..828228ba0dc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests_Java8.xml b/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests_Java8.xml index cc49af1aa8b..a327db99e3c 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests_Java8.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/URLClassLoaderTests_Java8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/build.xml b/test/functional/cmdLineTests/URLClassLoaderTests/build.xml index 28039ed2e6b..571a4d641c4 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/build.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/exclude.xml b/test/functional/cmdLineTests/URLClassLoaderTests/exclude.xml index e0fef283028..3eb80660f3d 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/exclude.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/excludeJava8.xml b/test/functional/cmdLineTests/URLClassLoaderTests/excludeJava8.xml index 273c9147853..f8d7cb0198f 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/excludeJava8.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/excludeJava8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/playlist.xml b/test/functional/cmdLineTests/URLClassLoaderTests/playlist.xml index b46938f05e9..4c4e44debfc 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/playlist.xml +++ b/test/functional/cmdLineTests/URLClassLoaderTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/readme.txt b/test/functional/cmdLineTests/URLClassLoaderTests/readme.txt index 6434a767ecc..4e5d4e3ea44 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/readme.txt +++ b/test/functional/cmdLineTests/URLClassLoaderTests/readme.txt @@ -18,7 +18,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # These tests are designed to check the implementation of class sharing in URLClassLoader. diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/runAllBluebird.bat b/test/functional/cmdLineTests/URLClassLoaderTests/runAllBluebird.bat index 7690c586316..cad753da622 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/runAllBluebird.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/runAllBluebird.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set BASEDIR=C:\ben\URLClassLoaderTests diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/runAllJ9test.bat b/test/functional/cmdLineTests/URLClassLoaderTests/runAllJ9test.bat index 55a482d96e7..31c6534ad78 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/runAllJ9test.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/runAllJ9test.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set BASEDIR="C:\j9test\testsuite60\SharedClasses\URLClassLoaderTests" diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava5.bat b/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava5.bat index 49db256efb1..35125b668dd 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava5.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava5.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set BASEDIR=C:\ben\URLClassLoaderTests diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava6.bat b/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava6.bat index 45fff652b70..d7ee694463e 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava6.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/runAllJava6.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem set BASEDIR=C:\ben\URLClassLoaderTests diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/runTest.bat b/test/functional/cmdLineTests/URLClassLoaderTests/runTest.bat index 5fa1e4a9c1d..3f3a384899f 100644 --- a/test/functional/cmdLineTests/URLClassLoaderTests/runTest.bat +++ b/test/functional/cmdLineTests/URLClassLoaderTests/runTest.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem %1\java -DTESTBASE=%3 -DTESTSUITE=%8 -DTOOLSDIR=%2 -DEXTDIR=%5 -DNETDIR=%6 -DEXE=%4 -DVMOPTIONS=%9 -jar C:\j9test\cmdlinetester\cmdlinetester.jar -config %3\%8\%8_win.xml -xids all -xlist %3\%7 diff --git a/test/functional/cmdLineTests/ValueBasedClassTest/build.xml b/test/functional/cmdLineTests/ValueBasedClassTest/build.xml index a7b53bc60c4..4b41ccea480 100644 --- a/test/functional/cmdLineTests/ValueBasedClassTest/build.xml +++ b/test/functional/cmdLineTests/ValueBasedClassTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/ValueBasedClassTest/jep390.xml b/test/functional/cmdLineTests/ValueBasedClassTest/jep390.xml index ff7b7700dc6..0512c43ce76 100644 --- a/test/functional/cmdLineTests/ValueBasedClassTest/jep390.xml +++ b/test/functional/cmdLineTests/ValueBasedClassTest/jep390.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/ValueBasedClassTest/playlist.xml b/test/functional/cmdLineTests/ValueBasedClassTest/playlist.xml index 779450dae12..e738c9a7b51 100644 --- a/test/functional/cmdLineTests/ValueBasedClassTest/playlist.xml +++ b/test/functional/cmdLineTests/ValueBasedClassTest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClass.java b/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClass.java index 848f3dbb514..4485e2dce11 100644 --- a/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClass.java +++ b/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.JEP390Test; diff --git a/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClassTest.java b/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClassTest.java index 341b93f68d2..23f7ced40fc 100644 --- a/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClassTest.java +++ b/test/functional/cmdLineTests/ValueBasedClassTest/src/org/openj9/test/JEP390Test/ValueBasedClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.JEP390Test; /** diff --git a/test/functional/cmdLineTests/bootStrapStaticVerify/bootStrapStaticVerify.xml b/test/functional/cmdLineTests/bootStrapStaticVerify/bootStrapStaticVerify.xml index 7912c9b6f11..9178edece33 100644 --- a/test/functional/cmdLineTests/bootStrapStaticVerify/bootStrapStaticVerify.xml +++ b/test/functional/cmdLineTests/bootStrapStaticVerify/bootStrapStaticVerify.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/bootStrapStaticVerify/build.xml b/test/functional/cmdLineTests/bootStrapStaticVerify/build.xml index e1dfaeb5419..61f83f3e0c2 100644 --- a/test/functional/cmdLineTests/bootStrapStaticVerify/build.xml +++ b/test/functional/cmdLineTests/bootStrapStaticVerify/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/bootStrapStaticVerify/playlist.xml b/test/functional/cmdLineTests/bootStrapStaticVerify/playlist.xml index 20c30004880..a4ffc939c6a 100644 --- a/test/functional/cmdLineTests/bootStrapStaticVerify/playlist.xml +++ b/test/functional/cmdLineTests/bootStrapStaticVerify/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/bsmargstest.xml b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/bsmargstest.xml index c7b6b4395b9..11f5dc49375 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/bsmargstest.xml +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/bsmargstest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/build.xml b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/build.xml index 4cec2f78c90..bd69d94a963 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/build.xml +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/playlist.xml b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/playlist.xml index 62fd0fa4255..8de473fc6eb 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/playlist.xml +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryFieldref.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryFieldref.jcod index 1ded87f8310..714eddd3369 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryFieldref.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryFieldref.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* A valid index stored in the bootstrap_arguments array only belongs to of the following types: diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInterfaceMethodref.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInterfaceMethodref.jcod index 24d2f78e7f2..cb47dc1f6eb 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInterfaceMethodref.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInterfaceMethodref.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* A valid index stored in the bootstrap_arguments array only belongs to of the following types: diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInvokeDynamic.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInvokeDynamic.jcod index 435739af9a5..e87cf607171 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInvokeDynamic.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryInvokeDynamic.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* A valid index stored in the bootstrap_arguments array only belongs to of the following types: diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryMethodref.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryMethodref.jcod index 4b8d5672934..36ccbf26ab0 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryMethodref.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryMethodref.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* A valid index stored in the bootstrap_arguments array only belongs to of the following types: diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryNameAndType.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryNameAndType.jcod index 679cd9996d5..5aa5c6854a2 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryNameAndType.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryNameAndType.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* A valid index stored in the bootstrap_arguments array only belongs to of the following types: diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryUtf8.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryUtf8.jcod index b86b6e20291..5eb6041324a 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryUtf8.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPEntryUtf8.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* A valid index stored in the bootstrap_arguments array only belongs to of the following types: diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.java b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.java index 6edacd7fa73..09369095af6 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.java +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This is a test template is used to generate jcod files with invalid boostrap method arguments */ diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.jcod b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.jcod index f1e7247699c..c59516bd22b 100644 --- a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.jcod +++ b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/src/org/openj9/test/bsmargs/RejectInvalidCPTestTemplate.jcod @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* This is a test template is used to generate jcod files with invalid boostrap method arguments */ diff --git a/test/functional/cmdLineTests/build.xml b/test/functional/cmdLineTests/build.xml index 27070d6c24b..8a9ee61c4eb 100644 --- a/test/functional/cmdLineTests/build.xml +++ b/test/functional/cmdLineTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/buildTools.xml b/test/functional/cmdLineTests/buildTools.xml index 381b8cadca6..059c8ed42ab 100644 --- a/test/functional/cmdLineTests/buildTools.xml +++ b/test/functional/cmdLineTests/buildTools.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/callsitedbgddrext/build.xml b/test/functional/cmdLineTests/callsitedbgddrext/build.xml index cc7eff2393d..7017b12e66a 100644 --- a/test/functional/cmdLineTests/callsitedbgddrext/build.xml +++ b/test/functional/cmdLineTests/callsitedbgddrext/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/callsitedbgddrext/callsiteddrtests.xml b/test/functional/cmdLineTests/callsitedbgddrext/callsiteddrtests.xml index 205295b02ed..ecd28554371 100644 --- a/test/functional/cmdLineTests/callsitedbgddrext/callsiteddrtests.xml +++ b/test/functional/cmdLineTests/callsitedbgddrext/callsiteddrtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/callsitedbgddrext/playlist.xml b/test/functional/cmdLineTests/callsitedbgddrext/playlist.xml index 09a46be929e..9b0fa52d388 100644 --- a/test/functional/cmdLineTests/callsitedbgddrext/playlist.xml +++ b/test/functional/cmdLineTests/callsitedbgddrext/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/classLoaderTest/autoModuleClassloaderTest.xml b/test/functional/cmdLineTests/classLoaderTest/autoModuleClassloaderTest.xml index 6ef8f719153..515402a8b9c 100644 --- a/test/functional/cmdLineTests/classLoaderTest/autoModuleClassloaderTest.xml +++ b/test/functional/cmdLineTests/classLoaderTest/autoModuleClassloaderTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/classLoaderTest/build.xml b/test/functional/cmdLineTests/classLoaderTest/build.xml index 55ce10a59a7..167752e51fe 100644 --- a/test/functional/cmdLineTests/classLoaderTest/build.xml +++ b/test/functional/cmdLineTests/classLoaderTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/classLoaderTest/enableAssertionStatusTest.xml b/test/functional/cmdLineTests/classLoaderTest/enableAssertionStatusTest.xml index 65e141d38a8..d162efb3339 100644 --- a/test/functional/cmdLineTests/classLoaderTest/enableAssertionStatusTest.xml +++ b/test/functional/cmdLineTests/classLoaderTest/enableAssertionStatusTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/classLoaderTest/playlist.xml b/test/functional/cmdLineTests/classLoaderTest/playlist.xml index 11e7401427c..49d926b5db0 100644 --- a/test/functional/cmdLineTests/classLoaderTest/playlist.xml +++ b/test/functional/cmdLineTests/classLoaderTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/assertionstatus/EnableAssertionStatusTest.java b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/assertionstatus/EnableAssertionStatusTest.java index 876b51ffa9a..c2718bc6d77 100644 --- a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/assertionstatus/EnableAssertionStatusTest.java +++ b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/assertionstatus/EnableAssertionStatusTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.assertionstatus; diff --git a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/AutoModuleClassloaderTest.java b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/AutoModuleClassloaderTest.java index c48682de2a6..b93da165836 100644 --- a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/AutoModuleClassloaderTest.java +++ b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/AutoModuleClassloaderTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.automodule; diff --git a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/CustomClassLoader.java b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/CustomClassLoader.java index deaaabfe7ac..aa971da7c7c 100644 --- a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/CustomClassLoader.java +++ b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.automodule; diff --git a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/Dummy.java b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/Dummy.java index 4e1ca77020c..9650d6d4307 100644 --- a/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/Dummy.java +++ b/test/functional/cmdLineTests/classLoaderTest/src/org/openj9/test/automodule/Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.automodule; diff --git a/test/functional/cmdLineTests/classesdbgddrext/build.xml b/test/functional/cmdLineTests/classesdbgddrext/build.xml index 85d527af606..3e4828913a2 100644 --- a/test/functional/cmdLineTests/classesdbgddrext/build.xml +++ b/test/functional/cmdLineTests/classesdbgddrext/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/classesdbgddrext/classesddrtests.xml b/test/functional/cmdLineTests/classesdbgddrext/classesddrtests.xml index fc4afbad39c..f1b96cf6116 100644 --- a/test/functional/cmdLineTests/classesdbgddrext/classesddrtests.xml +++ b/test/functional/cmdLineTests/classesdbgddrext/classesddrtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/classesdbgddrext/dbgextddrtests_excludes.xml b/test/functional/cmdLineTests/classesdbgddrext/dbgextddrtests_excludes.xml index e63f1fba7fe..8d31311e051 100644 --- a/test/functional/cmdLineTests/classesdbgddrext/dbgextddrtests_excludes.xml +++ b/test/functional/cmdLineTests/classesdbgddrext/dbgextddrtests_excludes.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/classesdbgddrext/playlist.xml b/test/functional/cmdLineTests/classesdbgddrext/playlist.xml index 2f038317960..39dc64bdd4a 100644 --- a/test/functional/cmdLineTests/classesdbgddrext/playlist.xml +++ b/test/functional/cmdLineTests/classesdbgddrext/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/build.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/build.xml index 1987f0fa6f3..764e82436bf 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/build.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests.xml index 4288a9d9c91..b2713a4b9fc 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests.xml @@ -19,7 +19,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java8.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java8.xml index 82aa647dda0..06503915b26 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java8.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java9.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java9.xml index 248a66bb335..316ab2e04bf 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java9.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java9.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java_common.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java_common.xml index e46f7e75a54..116b559a695 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java_common.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_Java_common.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console.xml index a948e6d723d..a728126a778 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console19.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console19.xml index 039bc89c318..f62338a7cb7 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console19.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_console19.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_consoleUpTo17.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_consoleUpTo17.xml index 7ea13c4c4c7..2e66cda00d3 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_consoleUpTo17.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_consoleUpTo17.xml @@ -19,7 +19,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_exclude.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_exclude.xml index 56db69d00d6..9046c40ebb0 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_exclude.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_firstThreadName.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_firstThreadName.xml index e45c3be72d4..11423c923cf 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_firstThreadName.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_firstThreadName.xml @@ -19,7 +19,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_native.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_native.xml index 98bacbfcdea..a6686a21156 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_native.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/j9tests_native.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/playlist.xml b/test/functional/cmdLineTests/cmdLineTest_J9tests/playlist.xml index 9793098cef1..7ca1fe2576e 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/playlist.xml +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/DefaultCharset.java b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/DefaultCharset.java index b6c5b803fa4..f7e1f0e4fae 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/DefaultCharset.java +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/DefaultCharset.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.nio.charset.Charset; diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/GetConsoleCharset.java b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/GetConsoleCharset.java index e84fd3bcf9a..d0a94f80cb3 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/GetConsoleCharset.java +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/GetConsoleCharset.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.*; diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/OnOutOfMemoryErrorTest.java b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/OnOutOfMemoryErrorTest.java index ba3cb3987a3..d15765ad870 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/OnOutOfMemoryErrorTest.java +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/OnOutOfMemoryErrorTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/TestStringBufferAndBuilderGrowth.java b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/TestStringBufferAndBuilderGrowth.java index 67a1e9bb153..2025871df7c 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/TestStringBufferAndBuilderGrowth.java +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/TestStringBufferAndBuilderGrowth.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import com.sun.management.OperatingSystemMXBean; diff --git a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/ThreadName.java b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/ThreadName.java index 03cca17fb0c..deed6a8d322 100644 --- a/test/functional/cmdLineTests/cmdLineTest_J9tests/src/ThreadName.java +++ b/test/functional/cmdLineTests/cmdLineTest_J9tests/src/ThreadName.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class ThreadName { diff --git a/test/functional/cmdLineTests/cmdlinetestertests/build.xml b/test/functional/cmdLineTests/cmdlinetestertests/build.xml index b9d0a7806c5..d7cb4db520f 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/build.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/cmdlinetests.xml b/test/functional/cmdLineTests/cmdlinetestertests/cmdlinetests.xml index e969fd37445..ed48dcadb78 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/cmdlinetests.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/cmdlinetests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/exclude.xml b/test/functional/cmdLineTests/cmdlinetestertests/exclude.xml index f6d8107748e..18861bfb382 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/exclude.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/playlist.xml b/test/functional/cmdLineTests/cmdlinetestertests/playlist.xml index 2519a320619..dab0afc3ace 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/playlist.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test1.xml b/test/functional/cmdLineTests/cmdlinetestertests/test1.xml index e9b8973f292..8ade3ea85fb 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test1.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test1.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test10.xml b/test/functional/cmdLineTests/cmdlinetestertests/test10.xml index 86381373d1d..42841a379ef 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test10.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test10.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test11.xml b/test/functional/cmdLineTests/cmdlinetestertests/test11.xml index 275f90a6eaa..681af5e2ea3 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test11.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test11.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test12.xml b/test/functional/cmdLineTests/cmdlinetestertests/test12.xml index d0cd8b11d17..329fc62438f 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test12.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test12.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test13.xml b/test/functional/cmdLineTests/cmdlinetestertests/test13.xml index e8d371f23c1..5ddb5197857 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test13.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test13.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test14.xml b/test/functional/cmdLineTests/cmdlinetestertests/test14.xml index 865f7d7b8a3..182cecb20d7 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test14.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test14.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test15.xml b/test/functional/cmdLineTests/cmdlinetestertests/test15.xml index fae53908ed5..4e081d63d46 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test15.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test15.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test16.xml b/test/functional/cmdLineTests/cmdlinetestertests/test16.xml index 9c19ea039f6..3f7a9857dcf 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test16.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test16.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test17.xml b/test/functional/cmdLineTests/cmdlinetestertests/test17.xml index b6090341ab4..4c9e3bfeafb 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test17.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test17.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test18.xml b/test/functional/cmdLineTests/cmdlinetestertests/test18.xml index 3d718a8aef2..c8f18322487 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test18.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test18.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test19.xml b/test/functional/cmdLineTests/cmdlinetestertests/test19.xml index 1109ea2fe43..696aff8fbb9 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test19.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test19.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test2.xml b/test/functional/cmdLineTests/cmdlinetestertests/test2.xml index af69642e1c0..03f6464067e 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test2.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test2.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test20.xml b/test/functional/cmdLineTests/cmdlinetestertests/test20.xml index 15326e3a6b2..8d8c3fff03b 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test20.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test20.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test21.xml b/test/functional/cmdLineTests/cmdlinetestertests/test21.xml index 45650710af5..d543fb064ef 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test21.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test21.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test22.xml b/test/functional/cmdLineTests/cmdlinetestertests/test22.xml index a7799b051e1..a6051d380a9 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test22.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test22.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test23.xml b/test/functional/cmdLineTests/cmdlinetestertests/test23.xml index a58c3fb7b80..12c7299f716 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test23.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test23.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test3.xml b/test/functional/cmdLineTests/cmdlinetestertests/test3.xml index 48757f93c3d..d612b4c7e77 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test3.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test3.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test4.xml b/test/functional/cmdLineTests/cmdlinetestertests/test4.xml index 54c0197e41c..c1506093e30 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test4.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test4.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test5.xml b/test/functional/cmdLineTests/cmdlinetestertests/test5.xml index 74c5898db44..54215889081 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test5.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test5.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test6.xml b/test/functional/cmdLineTests/cmdlinetestertests/test6.xml index 52798120253..2ec11b14c75 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test6.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test6.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test7.xml b/test/functional/cmdLineTests/cmdlinetestertests/test7.xml index 9a4ffe56ec6..94765e9111a 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test7.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test7.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test8.xml b/test/functional/cmdLineTests/cmdlinetestertests/test8.xml index 154ad34c24c..40d92d1c8f1 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test8.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/cmdlinetestertests/test9.xml b/test/functional/cmdLineTests/cmdlinetestertests/test9.xml index f6458c9a28e..f9f61d79948 100644 --- a/test/functional/cmdLineTests/cmdlinetestertests/test9.xml +++ b/test/functional/cmdLineTests/cmdlinetestertests/test9.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/build.xml b/test/functional/cmdLineTests/criu/build.xml index 2727dcdc99a..d5850f52ea6 100644 --- a/test/functional/cmdLineTests/criu/build.xml +++ b/test/functional/cmdLineTests/criu/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu.xml b/test/functional/cmdLineTests/criu/criu.xml index 813ddd3688c..23c57ea7540 100644 --- a/test/functional/cmdLineTests/criu/criu.xml +++ b/test/functional/cmdLineTests/criu/criu.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criuJitServerScript.sh b/test/functional/cmdLineTests/criu/criuJitServerScript.sh index 63adaf9673e..0ec6f91a523 100644 --- a/test/functional/cmdLineTests/criu/criuJitServerScript.sh +++ b/test/functional/cmdLineTests/criu/criuJitServerScript.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # echo "start running script"; diff --git a/test/functional/cmdLineTests/criu/criuRandomScript.sh b/test/functional/cmdLineTests/criu/criuRandomScript.sh index a57398186bf..6b96b706745 100644 --- a/test/functional/cmdLineTests/criu/criuRandomScript.sh +++ b/test/functional/cmdLineTests/criu/criuRandomScript.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # echo "start running script" diff --git a/test/functional/cmdLineTests/criu/criuScript.sh b/test/functional/cmdLineTests/criu/criuScript.sh index 3bec169c631..92e7c276918 100644 --- a/test/functional/cmdLineTests/criu/criuScript.sh +++ b/test/functional/cmdLineTests/criu/criuScript.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # echo "start running script"; diff --git a/test/functional/cmdLineTests/criu/criuSecurityScript.sh b/test/functional/cmdLineTests/criu/criuSecurityScript.sh index 5d9fec924a0..afadd8aa940 100644 --- a/test/functional/cmdLineTests/criu/criuSecurityScript.sh +++ b/test/functional/cmdLineTests/criu/criuSecurityScript.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # echo "start running script" diff --git a/test/functional/cmdLineTests/criu/criu_jitPostRestore.xml b/test/functional/cmdLineTests/criu/criu_jitPostRestore.xml index 4bc54f897b0..e9ab7b73560 100644 --- a/test/functional/cmdLineTests/criu/criu_jitPostRestore.xml +++ b/test/functional/cmdLineTests/criu/criu_jitPostRestore.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_jitserverAcrossCheckpoint.xml b/test/functional/cmdLineTests/criu/criu_jitserverAcrossCheckpoint.xml index 8a7550d5412..40fd277d19a 100644 --- a/test/functional/cmdLineTests/criu/criu_jitserverAcrossCheckpoint.xml +++ b/test/functional/cmdLineTests/criu/criu_jitserverAcrossCheckpoint.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_jitserverPostRestore.xml b/test/functional/cmdLineTests/criu/criu_jitserverPostRestore.xml index d5f249fe216..a41f1652d83 100644 --- a/test/functional/cmdLineTests/criu/criu_jitserverPostRestore.xml +++ b/test/functional/cmdLineTests/criu/criu_jitserverPostRestore.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_keepCheckpoint.xml b/test/functional/cmdLineTests/criu/criu_keepCheckpoint.xml index 1ee14c3f45d..9bed03d18b8 100644 --- a/test/functional/cmdLineTests/criu/criu_keepCheckpoint.xml +++ b/test/functional/cmdLineTests/criu/criu_keepCheckpoint.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_nonPortable.xml b/test/functional/cmdLineTests/criu/criu_nonPortable.xml index a05a2d54282..de6581a3d17 100644 --- a/test/functional/cmdLineTests/criu/criu_nonPortable.xml +++ b/test/functional/cmdLineTests/criu/criu_nonPortable.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_nonPortableJDK11Up.xml b/test/functional/cmdLineTests/criu/criu_nonPortableJDK11Up.xml index 3a3b5fdb3af..e03dcc0756f 100644 --- a/test/functional/cmdLineTests/criu/criu_nonPortableJDK11Up.xml +++ b/test/functional/cmdLineTests/criu/criu_nonPortableJDK11Up.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_nonPortable_RAS.xml b/test/functional/cmdLineTests/criu/criu_nonPortable_RAS.xml index be1c29a9905..4ed73a96a28 100644 --- a/test/functional/cmdLineTests/criu/criu_nonPortable_RAS.xml +++ b/test/functional/cmdLineTests/criu/criu_nonPortable_RAS.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_random.xml b/test/functional/cmdLineTests/criu/criu_random.xml index fc1f65fa3d2..58dcc290838 100644 --- a/test/functional/cmdLineTests/criu/criu_random.xml +++ b/test/functional/cmdLineTests/criu/criu_random.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/criu_security.xml b/test/functional/cmdLineTests/criu/criu_security.xml index 60fd8bc1e65..02aa2e77969 100644 --- a/test/functional/cmdLineTests/criu/criu_security.xml +++ b/test/functional/cmdLineTests/criu/criu_security.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/criu/playlist.xml b/test/functional/cmdLineTests/criu/playlist.xml index 49bbf1fc4e2..e980c1dbd32 100644 --- a/test/functional/cmdLineTests/criu/playlist.xml +++ b/test/functional/cmdLineTests/criu/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIURandomTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIURandomTest.java index da2cec28b79..dabf08b6425 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIURandomTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIURandomTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSecurityTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSecurityTest.java index 43d54859db1..cfbc760729b 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSecurityTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSecurityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSimpleTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSimpleTest.java index 3646e589b93..b7a91d98342 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSimpleTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUSimpleTest.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUTestUtils.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUTestUtils.java index 4ed900ec0fe..f717fdf86f3 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUTestUtils.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUTestUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/DeadlockTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/DeadlockTest.java index 72b8e026f2e..1620e8bffd6 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/DeadlockTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/DeadlockTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/EnvVarFileTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/EnvVarFileTest.java index a704f5b1433..418a12a0497 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/EnvVarFileTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/EnvVarFileTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/JDK11UpTimeoutAdjustmentTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/JDK11UpTimeoutAdjustmentTest.java index 342aaf3086d..c38b937eda1 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/JDK11UpTimeoutAdjustmentTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/JDK11UpTimeoutAdjustmentTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/OptionsFileTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/OptionsFileTest.java index df7441d311b..4e928ae409f 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/OptionsFileTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/OptionsFileTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestDelayedOperations.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestDelayedOperations.java index 2546bf7adcb..f243c9ecf12 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestDelayedOperations.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestDelayedOperations.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSecurityManager.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSecurityManager.java index 0efb8dad11a..b4846e2ddac 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSecurityManager.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSecurityManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeCheckpointException.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeCheckpointException.java index b7626d87579..abb188428b1 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeCheckpointException.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeCheckpointException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeRestoreException.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeRestoreException.java index e686617192c..ea4fe68d0d9 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeRestoreException.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeRestoreException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TimeChangeTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TimeChangeTest.java index c3d597b4745..1a061eab926 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/TimeChangeTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/TimeChangeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/criu/src/org/openj9/criu/UsernameTest.java b/test/functional/cmdLineTests/criu/src/org/openj9/criu/UsernameTest.java index 100cd134671..e93206e1267 100644 --- a/test/functional/cmdLineTests/criu/src/org/openj9/criu/UsernameTest.java +++ b/test/functional/cmdLineTests/criu/src/org/openj9/criu/UsernameTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.criu; diff --git a/test/functional/cmdLineTests/defaultLazySymbolResolution/build.xml b/test/functional/cmdLineTests/defaultLazySymbolResolution/build.xml index ef7dd121bc4..2fb72790838 100644 --- a/test/functional/cmdLineTests/defaultLazySymbolResolution/build.xml +++ b/test/functional/cmdLineTests/defaultLazySymbolResolution/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/defaultLazySymbolResolution/defaultLazySymbolResolution.xml b/test/functional/cmdLineTests/defaultLazySymbolResolution/defaultLazySymbolResolution.xml index 49cc84f7a5c..f8173ae2dbb 100644 --- a/test/functional/cmdLineTests/defaultLazySymbolResolution/defaultLazySymbolResolution.xml +++ b/test/functional/cmdLineTests/defaultLazySymbolResolution/defaultLazySymbolResolution.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml b/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml index 68cc8d03fc2..5434c15b4b4 100644 --- a/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml +++ b/test/functional/cmdLineTests/defaultLazySymbolResolution/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/build.xml b/test/functional/cmdLineTests/doProtectedAccessCheck/build.xml index 67c052845f6..439a39cff80 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/build.xml +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml b/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml index 0420e70de71..1a07419a604 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/doProtectedAccessCheck.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/playlist.xml b/test/functional/cmdLineTests/doProtectedAccessCheck/playlist.xml index 8102c4857e4..ac1dbaeb51b 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/playlist.xml +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/src/a/A.java b/test/functional/cmdLineTests/doProtectedAccessCheck/src/a/A.java index 64b6aabf35f..2ac6d0eab63 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/src/a/A.java +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/src/a/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package a; diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/src/b/B.java b/test/functional/cmdLineTests/doProtectedAccessCheck/src/b/B.java index c3603b8cb82..0a8b1610c50 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/src/b/B.java +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/src/b/B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package b; diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/JavaAgent.java b/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/JavaAgent.java index e6ba1c8c789..210196680a7 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/JavaAgent.java +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/JavaAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package javaagent; diff --git a/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/ProtectedClassFileTransformer.java b/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/ProtectedClassFileTransformer.java index 88d4dd6fa5a..212ac4b5830 100644 --- a/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/ProtectedClassFileTransformer.java +++ b/test/functional/cmdLineTests/doProtectedAccessCheck/src/javaagent/ProtectedClassFileTransformer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package javaagent; diff --git a/test/functional/cmdLineTests/dscr/build.xml b/test/functional/cmdLineTests/dscr/build.xml index 6b68a70d6d2..049dbcb660a 100644 --- a/test/functional/cmdLineTests/dscr/build.xml +++ b/test/functional/cmdLineTests/dscr/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/dscr/dscr.xml b/test/functional/cmdLineTests/dscr/dscr.xml index efa7978f320..30f3c8279cd 100644 --- a/test/functional/cmdLineTests/dscr/dscr.xml +++ b/test/functional/cmdLineTests/dscr/dscr.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/dscr/playlist.xml b/test/functional/cmdLineTests/dscr/playlist.xml index a3f3dc51151..cf4a808373c 100644 --- a/test/functional/cmdLineTests/dscr/playlist.xml +++ b/test/functional/cmdLineTests/dscr/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/dumpromtests/build.xml b/test/functional/cmdLineTests/dumpromtests/build.xml index 5484927ef1f..ef5c34d4564 100644 --- a/test/functional/cmdLineTests/dumpromtests/build.xml +++ b/test/functional/cmdLineTests/dumpromtests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/dumpromtests/dumpromclasstests.xml b/test/functional/cmdLineTests/dumpromtests/dumpromclasstests.xml index 03d04494481..e4884f9208a 100644 --- a/test/functional/cmdLineTests/dumpromtests/dumpromclasstests.xml +++ b/test/functional/cmdLineTests/dumpromtests/dumpromclasstests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/dumpromtests/dumpromclasstests_excludes.xml b/test/functional/cmdLineTests/dumpromtests/dumpromclasstests_excludes.xml index e4d479def34..0fce0342dbe 100644 --- a/test/functional/cmdLineTests/dumpromtests/dumpromclasstests_excludes.xml +++ b/test/functional/cmdLineTests/dumpromtests/dumpromclasstests_excludes.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/dumpromtests/playlist.xml b/test/functional/cmdLineTests/dumpromtests/playlist.xml index 82bd7ff035e..65589e9ecef 100644 --- a/test/functional/cmdLineTests/dumpromtests/playlist.xml +++ b/test/functional/cmdLineTests/dumpromtests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/fastClassHashTable/build.xml b/test/functional/cmdLineTests/fastClassHashTable/build.xml index ab4be4e7445..62a4ee5765e 100644 --- a/test/functional/cmdLineTests/fastClassHashTable/build.xml +++ b/test/functional/cmdLineTests/fastClassHashTable/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/fastClassHashTable/fastClassHashTableTest.xml b/test/functional/cmdLineTests/fastClassHashTable/fastClassHashTableTest.xml index 9fbaaf2e8f0..ea9241fa095 100644 --- a/test/functional/cmdLineTests/fastClassHashTable/fastClassHashTableTest.xml +++ b/test/functional/cmdLineTests/fastClassHashTable/fastClassHashTableTest.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/fastClassHashTable/playlist.xml b/test/functional/cmdLineTests/fastClassHashTable/playlist.xml index 0bab800efad..aa58520590f 100644 --- a/test/functional/cmdLineTests/fastClassHashTable/playlist.xml +++ b/test/functional/cmdLineTests/fastClassHashTable/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/fips/build.xml b/test/functional/cmdLineTests/fips/build.xml index 91715e4906b..6fdbf5d6b03 100644 --- a/test/functional/cmdLineTests/fips/build.xml +++ b/test/functional/cmdLineTests/fips/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/fips/fips.xml b/test/functional/cmdLineTests/fips/fips.xml index f3c8c96a677..f669329a1ef 100644 --- a/test/functional/cmdLineTests/fips/fips.xml +++ b/test/functional/cmdLineTests/fips/fips.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/fips/playlist.xml b/test/functional/cmdLineTests/fips/playlist.xml index 96db277401b..4ce4fee90c3 100644 --- a/test/functional/cmdLineTests/fips/playlist.xml +++ b/test/functional/cmdLineTests/fips/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSKeyExtractImport.java b/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSKeyExtractImport.java index 74adb968610..f3bd3f065e7 100644 --- a/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSKeyExtractImport.java +++ b/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSKeyExtractImport.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fips; diff --git a/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSProvidersTest.java b/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSProvidersTest.java index ef15a3e1099..5fe5c834539 100644 --- a/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSProvidersTest.java +++ b/test/functional/cmdLineTests/fips/src/org/openj9/test/fips/FIPSProvidersTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.fips; diff --git a/test/functional/cmdLineTests/forceLazySymbolResolution/build.xml b/test/functional/cmdLineTests/forceLazySymbolResolution/build.xml index fcc9b7b0316..7f34cccd9be 100644 --- a/test/functional/cmdLineTests/forceLazySymbolResolution/build.xml +++ b/test/functional/cmdLineTests/forceLazySymbolResolution/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/forceLazySymbolResolution/forceLazySymbolResolution.xml b/test/functional/cmdLineTests/forceLazySymbolResolution/forceLazySymbolResolution.xml index d0038ceda45..a768b5064c6 100644 --- a/test/functional/cmdLineTests/forceLazySymbolResolution/forceLazySymbolResolution.xml +++ b/test/functional/cmdLineTests/forceLazySymbolResolution/forceLazySymbolResolution.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/forceLazySymbolResolution/playlist.xml b/test/functional/cmdLineTests/forceLazySymbolResolution/playlist.xml index 01b15afecbc..fed98b116d0 100644 --- a/test/functional/cmdLineTests/forceLazySymbolResolution/playlist.xml +++ b/test/functional/cmdLineTests/forceLazySymbolResolution/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/gcCheck/build.xml b/test/functional/cmdLineTests/gcCheck/build.xml index 041aaa932db..1bca45ce8de 100644 --- a/test/functional/cmdLineTests/gcCheck/build.xml +++ b/test/functional/cmdLineTests/gcCheck/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcCheck/gcchecktests.xml b/test/functional/cmdLineTests/gcCheck/gcchecktests.xml index 1ba72f0505d..948923a2e21 100644 --- a/test/functional/cmdLineTests/gcCheck/gcchecktests.xml +++ b/test/functional/cmdLineTests/gcCheck/gcchecktests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcCheck/gcchecktestsMetronome.xml b/test/functional/cmdLineTests/gcCheck/gcchecktestsMetronome.xml index 0051b0a6b6e..69faf252c89 100644 --- a/test/functional/cmdLineTests/gcCheck/gcchecktestsMetronome.xml +++ b/test/functional/cmdLineTests/gcCheck/gcchecktestsMetronome.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcCheck/gcchecktests_excludes.xml b/test/functional/cmdLineTests/gcCheck/gcchecktests_excludes.xml index f640d90219a..108beff8280 100644 --- a/test/functional/cmdLineTests/gcCheck/gcchecktests_excludes.xml +++ b/test/functional/cmdLineTests/gcCheck/gcchecktests_excludes.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcCheck/playlist.xml b/test/functional/cmdLineTests/gcCheck/playlist.xml index 52230f51b7f..58d8ab63166 100644 --- a/test/functional/cmdLineTests/gcCheck/playlist.xml +++ b/test/functional/cmdLineTests/gcCheck/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/gcCheck/src/org/openj9/test/nogc/Main.java b/test/functional/cmdLineTests/gcCheck/src/org/openj9/test/nogc/Main.java index a07d6bc9b87..16aff95a01a 100644 --- a/test/functional/cmdLineTests/gcCheck/src/org/openj9/test/nogc/Main.java +++ b/test/functional/cmdLineTests/gcCheck/src/org/openj9/test/nogc/Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.nogc;; diff --git a/test/functional/cmdLineTests/gcRegressionTests/build.xml b/test/functional/cmdLineTests/gcRegressionTests/build.xml index b3547ba2b02..f90d6908d52 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/build.xml +++ b/test/functional/cmdLineTests/gcRegressionTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests.xml b/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests.xml index cfe18e8c5b9..930385a64ba 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests.xml +++ b/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests_excludes.xml b/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests_excludes.xml index b9d87678750..3580ef7c9ff 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests_excludes.xml +++ b/test/functional/cmdLineTests/gcRegressionTests/gcRegressionTests_excludes.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests.xml b/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests.xml index 15b93867d0c..e925d0387f9 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests.xml +++ b/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests_excludes.xml b/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests_excludes.xml index 12b69d342f7..bdd39941970 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests_excludes.xml +++ b/test/functional/cmdLineTests/gcRegressionTests/gcRotatingVerboseLogTests_excludes.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcRegressionTests/playlist.xml b/test/functional/cmdLineTests/gcRegressionTests/playlist.xml index 344473ae901..ff5273d5677 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/playlist.xml +++ b/test/functional/cmdLineTests/gcRegressionTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/DynamicConfigurationExtractor.java b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/DynamicConfigurationExtractor.java index 874c61186b5..4b1b224b6fc 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/DynamicConfigurationExtractor.java +++ b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/DynamicConfigurationExtractor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tests.garbagecollector; import java.io.IOException; diff --git a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/EmptyTestClass.java b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/EmptyTestClass.java index bd1f5f16139..2d87dc766a7 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/EmptyTestClass.java +++ b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/EmptyTestClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tests.garbagecollector; public class EmptyTestClass {} diff --git a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/SpinAllocate.java b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/SpinAllocate.java index 873095741c6..2f3866a460b 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/SpinAllocate.java +++ b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/SpinAllocate.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tests.garbagecollector; diff --git a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoader.java b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoader.java index 4d97bc70e79..5470d614b9f 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoader.java +++ b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tests.garbagecollector; public class TestClassLoader extends ClassLoader { diff --git a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoaderMain.java b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoaderMain.java index 7d436f33959..3554e58db55 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoaderMain.java +++ b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestClassLoaderMain.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tests.garbagecollector; import java.io.IOException; diff --git a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestContractionMain.java b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestContractionMain.java index 744c1aaefb4..efe203bd88a 100644 --- a/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestContractionMain.java +++ b/test/functional/cmdLineTests/gcRegressionTests/src/com/ibm/tests/garbagecollector/TestContractionMain.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.tests.garbagecollector; diff --git a/test/functional/cmdLineTests/gcsuballoctests/build.xml b/test/functional/cmdLineTests/gcsuballoctests/build.xml index 3add73d58ec..0a2571093d5 100644 --- a/test/functional/cmdLineTests/gcsuballoctests/build.xml +++ b/test/functional/cmdLineTests/gcsuballoctests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests.xml b/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests.xml index 4b92aa1b58e..021de939d76 100644 --- a/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests.xml +++ b/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests_excludes.xml b/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests_excludes.xml index bd35eaf7a7f..5f7bf01450c 100644 --- a/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests_excludes.xml +++ b/test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests_excludes.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gcsuballoctests/playlist.xml b/test/functional/cmdLineTests/gcsuballoctests/playlist.xml index 87fd6cd91bd..3e67ba5d6d8 100644 --- a/test/functional/cmdLineTests/gcsuballoctests/playlist.xml +++ b/test/functional/cmdLineTests/gcsuballoctests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/getCallerClassTests/build.xml b/test/functional/cmdLineTests/getCallerClassTests/build.xml index 2d85501287a..54137fa5e7e 100644 --- a/test/functional/cmdLineTests/getCallerClassTests/build.xml +++ b/test/functional/cmdLineTests/getCallerClassTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests.xml b/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests.xml index 542b8630208..18d396f0454 100644 --- a/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests.xml +++ b/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests_8.xml b/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests_8.xml index 62540ff88f5..b4859db1188 100644 --- a/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests_8.xml +++ b/test/functional/cmdLineTests/getCallerClassTests/getCallerClassTests_8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/getCallerClassTests/playlist.xml b/test/functional/cmdLineTests/getCallerClassTests/playlist.xml index 24360430232..0c70731f009 100644 --- a/test/functional/cmdLineTests/getCallerClassTests/playlist.xml +++ b/test/functional/cmdLineTests/getCallerClassTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/gptest/build.xml b/test/functional/cmdLineTests/gptest/build.xml index cded97efd6f..9918c627167 100644 --- a/test/functional/cmdLineTests/gptest/build.xml +++ b/test/functional/cmdLineTests/gptest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gptest/cmdlineopttest_exclude.xml b/test/functional/cmdLineTests/gptest/cmdlineopttest_exclude.xml index fbe7088f87a..98de8c4df15 100644 --- a/test/functional/cmdLineTests/gptest/cmdlineopttest_exclude.xml +++ b/test/functional/cmdLineTests/gptest/cmdlineopttest_exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gptest/gptests.xml b/test/functional/cmdLineTests/gptest/gptests.xml index c6ec91a73a8..39555b0c94b 100644 --- a/test/functional/cmdLineTests/gptest/gptests.xml +++ b/test/functional/cmdLineTests/gptest/gptests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gptest/playlist.xml b/test/functional/cmdLineTests/gptest/playlist.xml index 2c0fc452aee..e234113c136 100644 --- a/test/functional/cmdLineTests/gptest/playlist.xml +++ b/test/functional/cmdLineTests/gptest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/gputests/build.xml b/test/functional/cmdLineTests/gputests/build.xml index c10178af86d..aaa3c44615a 100644 --- a/test/functional/cmdLineTests/gputests/build.xml +++ b/test/functional/cmdLineTests/gputests/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gputests/gputests.xml b/test/functional/cmdLineTests/gputests/gputests.xml index e65fa8b15cc..df32d1f3688 100644 --- a/test/functional/cmdLineTests/gputests/gputests.xml +++ b/test/functional/cmdLineTests/gputests/gputests.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gputests/gputests_exclude.xml b/test/functional/cmdLineTests/gputests/gputests_exclude.xml index a8bcef4a1f5..f1f85e4ef29 100644 --- a/test/functional/cmdLineTests/gputests/gputests_exclude.xml +++ b/test/functional/cmdLineTests/gputests/gputests_exclude.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/gputests/playlist.xml b/test/functional/cmdLineTests/gputests/playlist.xml index 24af1b8e1db..b6ef23e7260 100644 --- a/test/functional/cmdLineTests/gputests/playlist.xml +++ b/test/functional/cmdLineTests/gputests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/hangTest/build.xml b/test/functional/cmdLineTests/hangTest/build.xml index ec54ff12656..ed3f92c468d 100644 --- a/test/functional/cmdLineTests/hangTest/build.xml +++ b/test/functional/cmdLineTests/hangTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/hangTest/hang.sh b/test/functional/cmdLineTests/hangTest/hang.sh index 067690521ff..5e2185af172 100644 --- a/test/functional/cmdLineTests/hangTest/hang.sh +++ b/test/functional/cmdLineTests/hangTest/hang.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # echo "Script executed from: ${PWD}" diff --git a/test/functional/cmdLineTests/hangTest/hang.xml b/test/functional/cmdLineTests/hangTest/hang.xml index ec0ae3f186c..1778f4415f7 100644 --- a/test/functional/cmdLineTests/hangTest/hang.xml +++ b/test/functional/cmdLineTests/hangTest/hang.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/hangTest/playlist.xml b/test/functional/cmdLineTests/hangTest/playlist.xml index 71802a64408..fc77b48089d 100644 --- a/test/functional/cmdLineTests/hangTest/playlist.xml +++ b/test/functional/cmdLineTests/hangTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/hangTest/src/org/openj9/test/hangTest/Hang.java b/test/functional/cmdLineTests/hangTest/src/org/openj9/test/hangTest/Hang.java index 3c9b6e6c48b..c7e26770bc4 100644 --- a/test/functional/cmdLineTests/hangTest/src/org/openj9/test/hangTest/Hang.java +++ b/test/functional/cmdLineTests/hangTest/src/org/openj9/test/hangTest/Hang.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.hangTest; import java.io.IOException; diff --git a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/build.xml b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/build.xml index 93ac9948295..b25fa1c9c5b 100644 --- a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/build.xml +++ b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedvmoptions.xml b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedvmoptions.xml index 2762d4dd6be..8805ee35120 100644 --- a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedvmoptions.xml +++ b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedvmoptions.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedxxcolonoptions.xml b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedxxcolonoptions.xml index 12420d5376e..2e545813d2f 100644 --- a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedxxcolonoptions.xml +++ b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/ignoreunrecognizedxxcolonoptions.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/playlist.xml b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/playlist.xml index 14702e70b54..96a7bdc3df8 100644 --- a/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/playlist.xml +++ b/test/functional/cmdLineTests/ignoreUnrecognizedVMOptions/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/javaAssertions/build.xml b/test/functional/cmdLineTests/javaAssertions/build.xml index 63163dc2761..216f72955a6 100644 --- a/test/functional/cmdLineTests/javaAssertions/build.xml +++ b/test/functional/cmdLineTests/javaAssertions/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/javaAssertions/javaAssertions.xml b/test/functional/cmdLineTests/javaAssertions/javaAssertions.xml index 2422d5106ed..313889b3c89 100644 --- a/test/functional/cmdLineTests/javaAssertions/javaAssertions.xml +++ b/test/functional/cmdLineTests/javaAssertions/javaAssertions.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/javaAssertions/playlist.xml b/test/functional/cmdLineTests/javaAssertions/playlist.xml index ba502f3cba1..acfa8c118e2 100644 --- a/test/functional/cmdLineTests/javaAssertions/playlist.xml +++ b/test/functional/cmdLineTests/javaAssertions/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/javaAssertions/src/StringAssertionStatus.java b/test/functional/cmdLineTests/javaAssertions/src/StringAssertionStatus.java index 803a13ae9c5..add9b5f798b 100644 --- a/test/functional/cmdLineTests/javaAssertions/src/StringAssertionStatus.java +++ b/test/functional/cmdLineTests/javaAssertions/src/StringAssertionStatus.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ class StringAssertionStatus { diff --git a/test/functional/cmdLineTests/jep178staticLinkingTest/build.xml b/test/functional/cmdLineTests/jep178staticLinkingTest/build.xml index 0b16c9f2b79..5b7b6aba598 100644 --- a/test/functional/cmdLineTests/jep178staticLinkingTest/build.xml +++ b/test/functional/cmdLineTests/jep178staticLinkingTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jep178staticLinkingTest/jep178.xml b/test/functional/cmdLineTests/jep178staticLinkingTest/jep178.xml index 2938ed5f5c8..60c00c424d2 100644 --- a/test/functional/cmdLineTests/jep178staticLinkingTest/jep178.xml +++ b/test/functional/cmdLineTests/jep178staticLinkingTest/jep178.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jep178staticLinkingTest/playlist.xml b/test/functional/cmdLineTests/jep178staticLinkingTest/playlist.xml index 49bbf6e84ab..16980532950 100644 --- a/test/functional/cmdLineTests/jep178staticLinkingTest/playlist.xml +++ b/test/functional/cmdLineTests/jep178staticLinkingTest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticAgents.java b/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticAgents.java index 68451c242f2..005603ec5f2 100644 --- a/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticAgents.java +++ b/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticAgents.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.tests.jeptests; diff --git a/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticLinking.java b/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticLinking.java index e808fb517ad..2d5a0fd216d 100644 --- a/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticLinking.java +++ b/test/functional/cmdLineTests/jep178staticLinkingTest/src/com/ibm/j9/tests/jeptests/StaticLinking.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.tests.jeptests; diff --git a/test/functional/cmdLineTests/jimageinterface/build.xml b/test/functional/cmdLineTests/jimageinterface/build.xml index fed71dbe562..d39151fbb7d 100644 --- a/test/functional/cmdLineTests/jimageinterface/build.xml +++ b/test/functional/cmdLineTests/jimageinterface/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jimageinterface/jimageinterface.xml b/test/functional/cmdLineTests/jimageinterface/jimageinterface.xml index 27e05272080..3985f7603bb 100644 --- a/test/functional/cmdLineTests/jimageinterface/jimageinterface.xml +++ b/test/functional/cmdLineTests/jimageinterface/jimageinterface.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jimageinterface/playlist.xml b/test/functional/cmdLineTests/jimageinterface/playlist.xml index d2f3c474e3b..f23fbe3a39e 100644 --- a/test/functional/cmdLineTests/jimageinterface/playlist.xml +++ b/test/functional/cmdLineTests/jimageinterface/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/jit/CompilerArgumentTesting.xml b/test/functional/cmdLineTests/jit/CompilerArgumentTesting.xml index 50781e0feed..b134941ad12 100644 --- a/test/functional/cmdLineTests/jit/CompilerArgumentTesting.xml +++ b/test/functional/cmdLineTests/jit/CompilerArgumentTesting.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jit/build.xml b/test/functional/cmdLineTests/jit/build.xml index 3ba8450263e..87d7a6816b9 100644 --- a/test/functional/cmdLineTests/jit/build.xml +++ b/test/functional/cmdLineTests/jit/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jit/playlist.xml b/test/functional/cmdLineTests/jit/playlist.xml index 188c4be1866..845657f2107 100644 --- a/test/functional/cmdLineTests/jit/playlist.xml +++ b/test/functional/cmdLineTests/jit/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/jitserver/build.xml b/test/functional/cmdLineTests/jitserver/build.xml index d5fd628b45e..a754aa283f8 100644 --- a/test/functional/cmdLineTests/jitserver/build.xml +++ b/test/functional/cmdLineTests/jitserver/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jitserver/jitserverArgumentTesting.xml b/test/functional/cmdLineTests/jitserver/jitserverArgumentTesting.xml index cf8084ddbba..ee61e5ac652 100644 --- a/test/functional/cmdLineTests/jitserver/jitserverArgumentTesting.xml +++ b/test/functional/cmdLineTests/jitserver/jitserverArgumentTesting.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jitserver/jitserverScript.sh b/test/functional/cmdLineTests/jitserver/jitserverScript.sh index 900e1669bdc..56ccec226ae 100644 --- a/test/functional/cmdLineTests/jitserver/jitserverScript.sh +++ b/test/functional/cmdLineTests/jitserver/jitserverScript.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # echo "start running script"; diff --git a/test/functional/cmdLineTests/jitserver/jitserverconfig.sh b/test/functional/cmdLineTests/jitserver/jitserverconfig.sh index 2e9f1600d2e..3d00e9e7cc5 100644 --- a/test/functional/cmdLineTests/jitserver/jitserverconfig.sh +++ b/test/functional/cmdLineTests/jitserver/jitserverconfig.sh @@ -16,7 +16,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # START_PORT=38400 diff --git a/test/functional/cmdLineTests/jitserver/playlist.xml b/test/functional/cmdLineTests/jitserver/playlist.xml index e5eb0c088bd..8746e007228 100644 --- a/test/functional/cmdLineTests/jitserver/playlist.xml +++ b/test/functional/cmdLineTests/jitserver/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/jrvTest/build.xml b/test/functional/cmdLineTests/jrvTest/build.xml index 9ca58fb46ab..7a851715a65 100644 --- a/test/functional/cmdLineTests/jrvTest/build.xml +++ b/test/functional/cmdLineTests/jrvTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jrvTest/playlist.xml b/test/functional/cmdLineTests/jrvTest/playlist.xml index 783ea531796..3a039643390 100644 --- a/test/functional/cmdLineTests/jrvTest/playlist.xml +++ b/test/functional/cmdLineTests/jrvTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/README b/test/functional/cmdLineTests/jvmtitests/README index 88c2f391ef3..a831948035b 100644 --- a/test/functional/cmdLineTests/jvmtitests/README +++ b/test/functional/cmdLineTests/jvmtitests/README @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* This Readme is deprecated. Please run the jvmti test from the testKitGen framework. diff --git a/test/functional/cmdLineTests/jvmtitests/build.xml b/test/functional/cmdLineTests/jvmtitests/build.xml index c060a11c3fe..5584de409db 100644 --- a/test/functional/cmdLineTests/jvmtitests/build.xml +++ b/test/functional/cmdLineTests/jvmtitests/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml b/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml index d9778b73f87..8c6ac61fa90 100644 --- a/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml +++ b/test/functional/cmdLineTests/jvmtitests/decompilationtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml b/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml index 414c0f3ed3b..b2531cbb315 100644 --- a/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml +++ b/test/functional/cmdLineTests/jvmtitests/fieldwatchtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml index 536ec9709fc..6cddc41c950 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml index c176209472d..6db5424eb3f 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_Java11andUp.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_11.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_11.xml index 1703b017487..93ac7450af7 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_11.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_11.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_17.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_17.xml index 52a12502500..179e777c50a 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_17.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_17.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_19.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_19.xml index 27226378e0f..9699f0cd9ea 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_19.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_19.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_20.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_20.xml index bc2faec24a4..025674753b4 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_20.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_20.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_21.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_21.xml index 2e343d75137..ebc191a9fe3 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_21.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_21.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_8.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_8.xml index 8fc4094c1dc..f9d6a619f30 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_8.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_excludes_8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml index 72cb36e7047..7ea6c74e58e 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_extended.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml b/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml index dd81c443d46..6a4f89e0d41 100644 --- a/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml +++ b/test/functional/cmdLineTests/jvmtitests/jvmtitests_hcr.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jvmtitests/playlist.xml b/test/functional/cmdLineTests/jvmtitests/playlist.xml index bf525562cdc..0ed6fabfd6d 100644 --- a/test/functional/cmdLineTests/jvmtitests/playlist.xml +++ b/test/functional/cmdLineTests/jvmtitests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ASMTransformer.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ASMTransformer.java index 5afa3d34d54..50397d47e1d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ASMTransformer.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ASMTransformer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/AddTimerAdapter.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/AddTimerAdapter.java index b17d21f3dd6..4ced0bdb2f9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/AddTimerAdapter.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/AddTimerAdapter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/MyClassVisitor.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/MyClassVisitor.java index d85818ab36d..d94d2ad52e3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/MyClassVisitor.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/MyClassVisitor.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source.java index 0b5afd006fa..ff1bafa1027 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source10.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source10.java index 0cfd9f64dd8..16e03085669 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source10.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source11.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source11.java index 7aad3f2e121..638fd7d324a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source11.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source12.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source12.java index b634d5f41fd..4bd8a897977 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source12.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source13.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source13.java index 36c493b8623..b077b8338db 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source13.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source14.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source14.java index 50397950d60..9eebf84fdf9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source14.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source15.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source15.java index 258f73d6ba4..fae360027ef 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source15.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source15.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source16.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source16.java index 5f6a641f996..2bae09a0756 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source16.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source16.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source17.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source17.java index 2dfbbe6d79f..3e98a88913e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source17.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source17.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source18.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source18.java index 83effcb278a..c2e8e571987 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source18.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source18.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source19.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source19.java index 7ef441fd9b0..5ca35f0107c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source19.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source19.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source2.java index a91c0ca9673..2c82bfcae22 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source20.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source20.java index 6e4878bd28f..fe654d20db2 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source20.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source20.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source3.java index 85bef1c0ce0..cca8dbe7a8a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source4.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source4.java index 9fa4df9249b..831305ce05a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source4.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source5.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source5.java index d427f33a5c0..71911f7b591 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source5.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source6.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source6.java index 42853152c8e..775b93cb63c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source6.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source7.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source7.java index 724bf6cbd9d..4edf91230c6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source7.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source8.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source8.java index 8968bc8be9a..ddd3be30245 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source8.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source9.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source9.java index acac2552a80..4225177b903 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source9.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Source9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Timer.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Timer.java index e3bd08305bc..30ad4debef1 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Timer.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/Timer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.java index a9a87a40732..eb867d2ebf4 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/BCIWithASM/ta001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.BCIWithASM; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.java index 7bd5dd714fd..f5d657152af 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.addToBootstrapClassLoaderSearch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.java index 7e55037d211..fee1138b5f7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.addToBootstrapClassLoaderSearch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.java index 2f699dd692c..0ce1710bca1 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToBootstrapClassLoaderSearch/abcl003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.addToBootstrapClassLoaderSearch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.java index 126f7097b0c..af19e37e173 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.addToSystemClassLoaderSearch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.java index 9682f472ecc..2f5c44a4637 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.addToSystemClassLoaderSearch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.java index e9b3fbf0d08..242b0939b26 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/addToSystemClassLoaderSearch/ascl003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.addToSystemClassLoaderSearch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.java index e44ee82aede..c0370b61552 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/agentLibraryNatives/aln001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.agentLibraryNatives; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.java index 6b4532e6b49..c252d945b7e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/attachOptionsTest/att001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.attachOptionsTest; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.java index 3704b157362..fcda17c9459 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.classModificationAgent; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V1.java index 1f460717593..6cf82131b51 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.classModificationAgent; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V2.java index 676418e8ecf..a9e2d537963 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.classModificationAgent; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V3.java index 19de4685dda..23c4476de24 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.classModificationAgent; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V4.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V4.java index 479ae23d63f..6ccee8a9a85 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V4.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/classModificationAgent/cma001_TestClass_V4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.classModificationAgent; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameClassloader.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameClassloader.java index b9ab5be41a4..01ed4a3201b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameClassloader.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameClassloader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameMain.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameMain.java index 64482c1a054..d55577aaac7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameMain.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrameMain.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestInterfaceMethod.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestInterfaceMethod.java index 661331d5828..af43bc033b8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestInterfaceMethod.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestInterfaceMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestMethod.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestMethod.java index ead4b72068d..9baf6a6c974 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestMethod.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/ResolveFrame_TestMethod.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.java index 873aa144b41..0fb664fb53c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.java index 0e5cee9664d..54a3dd8482e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.java index 70527c5be26..91a1b490701 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.java index 92a75fea6a9..b97a18e7071 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp004.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.java index 000ff748e2c..092df471b37 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/decomp005.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompResolveFrame; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/fThread.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/fThread.java index 32c903cad74..7e0cff820b6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/fThread.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompResolveFrame/fThread.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * fThread.java diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest.java index 204a020ac7b..4903d816791 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompileAtMethodResolve; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1.java index 13a90972511..16d5f9f52db 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompileAtMethodResolve; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1Super.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1Super.java index e3e7190fd97..dd817e935fc 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1Super.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest1Super.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompileAtMethodResolve; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2.java index 0c27276f98e..1bcedf728c0 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompileAtMethodResolve; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2Super.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2Super.java index 52acc16ce15..038944ad4b1 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2Super.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/decompileAtMethodResolve/ResolveTest2Super.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.decompileAtMethodResolve; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.java index 642c69e281b..e9686ff227d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventClassFileLoadHook/ecflh001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventClassFileLoadHook; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.java index 521837c3727..f3a18811644 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventException/ee001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventException; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.java index 18925b0bc4c..5e8ba123403 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodEntryGrow/emeng001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventMethodEntryGrow; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.java index 8860e5494f0..2b152c70d2e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventMethodExit/emex001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventMethodExit; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.java index b1a4993fc90..b297f9bf935 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventThreadStart/ets001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventThreadStart; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.java index d7606d3e41c..349a12a92d3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMObjectAllocation/evmoa001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventVMObjectAllocation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.java index 1cadf9ec7d6..8bc7f91fc42 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/eventVMStart/vmstart001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.eventVMStart; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/exampleTestCase/TestExampleTestCase.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/exampleTestCase/TestExampleTestCase.java index 9c4c6177f46..3d5212f82d9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/exampleTestCase/TestExampleTestCase.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/exampleTestCase/TestExampleTestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.exampleTestCase; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/MyObject.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/MyObject.java index b77f052757f..26775a623e5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/MyObject.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/MyObject.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.fieldwatch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/TestDriver.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/TestDriver.java index 4e47b103a8a..624739d6159 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/TestDriver.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/TestDriver.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.fieldwatch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.java index 897132079ea..85fa0f8ed07 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/fieldwatch/fw001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.fieldwatch; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/Hello.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/Hello.java index 845592ad226..33f6f766ee9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/Hello.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/Hello.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC1.java index 99b60bce748..b2eb0345399 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC2.java index ffafc43cbeb..9216846b854 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloC2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI1.java index 5c47d37ad96..e52acbb42b9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI2.java index 554a66cbf58..0f503770787 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/HelloI2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/TagManager.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/TagManager.java index 748f5201dbf..d067ea42cab 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/TagManager.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/TagManager.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.java index 24651443988..bf1f48d22ed 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.java index 6528483555f..0d26502d9cc 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C1.java index 9956c519575..54a638475c3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C2.java index 210ea0a8f66..36903c586ec 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr002C2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.java index 249e4e31d08..1556ee59c3c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.java index 0ccd5f2a843..0a2fad72c61 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/followReferences/fr004.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.followReferences; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/MethodExitTestThread.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/MethodExitTestThread.java index bc413cca29f..a3442266f5c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/MethodExitTestThread.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/MethodExitTestThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/Semaphore.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/Semaphore.java index 8088c0f60d7..bc5fb7efbb5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/Semaphore.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/Semaphore.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnRunner.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnRunner.java index 43bd17b6aa3..e37f16771af 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnRunner.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnTrigger.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnTrigger.java index 171d5d19c83..d70186d5d0a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnTrigger.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/TestForceEarlyReturnTrigger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.java index 2d4bf6a9927..79c409d10cd 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.java index cb035ceb707..099426f91d1 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.java index 57429cbd07c..e65b615e20b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/forceEarlyReturn/fer003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.forceEarlyReturn; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.java index ab35b20b0ba..e05724754bf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getAllStackTracesExtended/gaste001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getAllStackTracesExtended; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.java index ff08982038a..c61ae98b71d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getClassFields; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001_testClass.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001_testClass.java index 843d3768077..a6d0e5c5316 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001_testClass.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassFields/gcf001_testClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getClassFields; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/VersionedClass.java.dont_auto_compile b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/VersionedClass.java.dont_auto_compile index d3ec0ba18d2..a8dc8f4a921 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/VersionedClass.java.dont_auto_compile +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/VersionedClass.java.dont_auto_compile @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getClassVersionNumbers.VersionedClass; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.java index dec840be8d0..e080ee1a239 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getClassVersionNumbers/gcvn001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getClassVersionNumbers; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/TestGetConstantPool.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/TestGetConstantPool.java index 6cc30a7be85..93ae9764dd4 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/TestGetConstantPool.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getConstantPool/TestGetConstantPool.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getConstantPool; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.java index 4a5286392ee..46baa77d6ac 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getCurrentThreadCpuTimerInfo/gctcti001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getCurrentThreadCpuTimerInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.java index 16193f5f2b8..7259b220f08 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getHeapFreeTotalMemory/ghftm001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getHeapFreeTotalMemory; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.java index 47968eceec8..98538ac6439 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9method/gj9m001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getJ9method; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.java index e457ff2f238..1f2a7c0b4b3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getJ9vmThread/gjvmt001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getJ9vmThread; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.java index 328c3b7287f..a36c6143518 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getLoadedClasses/glc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getLoadedClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.java index d36da02cdb9..d64dd9e059e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMemoryCategories/gmc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getMemoryCategories; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.java index c31bc979499..2c669f5b0c3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getMethodAndClassNames/gmcpn001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getMethodAndClassNames; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.java index 207fea07c14..e43adfbea34 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOrSetLocal/gosl001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOrSetLocal; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/ThreadMonitorInfoTest.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/ThreadMonitorInfoTest.java index 29cae827d5a..3eece5acfd3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/ThreadMonitorInfoTest.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/ThreadMonitorInfoTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOwnedMonitorInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.java index 2bca20f4675..9a23e306ff8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOwnedMonitorInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.java index 82ff44f42f4..089d00232c6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorInfo/gomi002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOwnedMonitorInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/ThreadNDepth.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/ThreadNDepth.java index 5ff0a5a27a0..bbe888de62c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/ThreadNDepth.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/ThreadNDepth.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOwnedMonitorStackDepthInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.java index 643b5279b92..7835f53c797 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOwnedMonitorStackDepthInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.java index 7595c285d06..74a9a85c41f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getOwnedMonitorStackDepthInfo/gomsdi002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getOwnedMonitorStackDepthInfo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.java index fa9d61fddb0..634b3a890fe 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getPotentialCapabilities; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.java index c6761178d46..1c4dd39a833 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getPotentialCapabilities; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.java index e6d72063be0..cc3fd9130c4 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getStackTrace; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.java index b677679ce09..8fd5ae6cdc3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTrace/gst002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getStackTrace; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.java index 6b67d7c4fbc..adfd088373a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getStackTraceExtended/gste001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getStackTraceExtended; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.java index dff891dcaa9..1091a46c9c8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getSystemProperty/gsp001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getSystemProperty; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.java index fa5637731ed..bff8146b852 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getThreadGroupChildren; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.java index 9ca55749281..785728f1f34 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadGroupChildren/gtgc002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getThreadGroupChildren; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.java index 1a42da79192..dfd2f9f0442 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadListStackTracesExtended/gtlste001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getThreadListStackTracesExtended; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.java index b8f61dee151..7bd388b1745 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/getThreadState/gts001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.getThreadState; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.java index 8e2ef3005e2..9ff3c88d855 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverHeap/ioh001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.iterateOverHeap; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.java index 2d777cdc8ce..f06cb0c9acc 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.iterateOverInstancesOfClass; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001Class.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001Class.java index 7ab75ec55e9..12ea56fc493 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001Class.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001Class.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.iterateOverInstancesOfClass; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001SubClass.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001SubClass.java index ad6333b4836..1c3d7db87ea 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001SubClass.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateOverInstancesOfClass/ioioc001SubClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.iterateOverInstancesOfClass; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.java index 844a51d111b..d0d571b8342 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.iterateThroughHeap; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001Sub.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001Sub.java index 6b161c37892..3a2121d7b77 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001Sub.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/iterateThroughHeap/ith001Sub.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.iterateThroughHeap; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.java index a3028cc5749..c7ebeffd69a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlm001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.javaLockMonitoring; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlmresult001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlmresult001.java index b38b52df31a..14f98f35985 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlmresult001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/javaLockMonitoring/jlmresult001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.javaLockMonitoring; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.java index 6f4081be54b..2b36b687ced 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/log/log001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.log; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/ClassGenerator.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/ClassGenerator.java index 8aec35c26ac..8ace1a5272d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/ClassGenerator.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/ClassGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.nestMatesRedefinition; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/CustomClassLoader.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/CustomClassLoader.java index 7bb9ccc5dd7..e9dae473c10 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/CustomClassLoader.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.nestMatesRedefinition; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestHostAttribute.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestHostAttribute.java index 3a65cff0358..31f47bea3fa 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestHostAttribute.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestHostAttribute.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.nestMatesRedefinition; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestMembersAttribute.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestMembersAttribute.java index 5ab769f91e5..ab522c02eb6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestMembersAttribute.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/NestMembersAttribute.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.nestMatesRedefinition; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/RedefinitionPhase.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/RedefinitionPhase.java index 6b16c91c491..9ad483fb7b9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/RedefinitionPhase.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/RedefinitionPhase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.nestMatesRedefinition; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.java index 06aa4d22d05..f45ff43a556 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/nestMatesRedefinition/nmr001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.nestMatesRedefinition; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.java index 40a17ec2f7c..9d2b8dd3459 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineBreakpointCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V1.java index 67971370ce2..2d44b969696 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineBreakpointCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V2.java index 3e46e450a08..0f866004586 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineBreakpointCombo/rbc001_testClass_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineBreakpointCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.java index 00131214b08..2ace6e311a8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_O1.java index a606a44bbc1..2acda694095 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_R1.java index 81a52a9954b..a48c98da105 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceMethodBody_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceSelfWithSelf.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceSelfWithSelf.java index fa9ed86182d..7f59920fd2d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceSelfWithSelf.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testReplaceSelfWithSelf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_O1.java index ef824a3b60a..863f0a3eb1f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R1.java index bb99a1e44b6..1365c8d0700 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R2.java index 264f68cd888..1b8173c7a65 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testStaticFixups_R2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_O1.java index b3589ea1684..6a16db0b23c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_R1.java index fcdd029c670..4948112eda1 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubA.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubA.java index 0b970225e79..8a2ca1054ba 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubA.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubB.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubB.java index ab6beb9af35..4a954eaf1a9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubB.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc001_testVTableFixups_SubB.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.java index 1ccaaad2dea..245eb1a2015 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_O1.java index d3550df01eb..db83248ced3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_R1.java index f947e054cd9..1e08feffb41 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethodThenRevertBack_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_O1.java index fd5faa7d7b2..a3577f3d415 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_R1.java index 87c1a024fbc..91a7b4378d2 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testAddMethod_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_O1.java index c353efd4e94..612c62ad0e2 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_R1.java index 7963a5e56a5..3cff0adf812 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethodThenRevertBack_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_O1.java index 7121660a160..0f5be33f264 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_R1.java index a25af3f2f3e..8c123f3380e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc002_testDeleteMethod_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.java index 6bfae89e5f6..1059d93b89d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_O1.java index 53bd413dbd9..aa45ab5fc16 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_R1.java index de8dcf4cd6e..0b9c3e116f5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testAddField_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_O1.java index 5beca965ea3..fc949efe1fa 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R1.java index 6895c5cf49e..3ff3d39e399 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R2.java index 43396fc6268..acd291095a2 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testFieldPersistence_R2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_O1.java index 75ce28ab618..5aa1f124318 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_R1.java index 5469ceeb76e..c15e9933339 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc003_testRemoveField_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.java index f09cbe3ba89..5ccb230bc70 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_O1.java index 5c87abf6114..b82694ef71a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_R1.java index 00164f67bee..abbe909010b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testReOrderingStaticFields_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_O1.java index 69350ccc9ae..d87f351784a 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_R1.java index 022c0bbc47a..0cb9e6e7821 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc004_testStaticFieldIDsAfterRedefine_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.java index 8380e885df8..71905112b6b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_O1.java index f4ba41693f7..1260cbb5686 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_R1.java index 489bada5aa8..3fb31b46b88 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc005_testConstantPoolChanges_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.java index 4c6370bd1b4..7eca0d98072 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_O1.java index c372b4d8cc9..8145ecb52a9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_R1.java index 26978e626c2..56117be7a4b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc006_testMethodIDsAfterRedefine_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.java index 00d3259cca9..00f41e781ba 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyA_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyA_O1.java index fabfbb8d172..535630426ae 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyA_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyA_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_O1.java index b09de0bdc53..56d18eadb86 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_R1.java index f18966d1a02..5917ecd2238 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyB_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyC_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyC_O1.java index 74276d8f138..36ee8ce2797 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyC_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyC_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_O1.java index d4d21f23172..5e84c1c85e8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_R1.java index 65d3358a47c..84ce1d9b06b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_MultipleRedefinesFromSameHierarchyD_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O1.java index 1f0afc53dc9..dbac52cbe13 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O2.java index 71c6bf6f276..206fb06f4c6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R1.java index f8f591fbf6e..66621785dcf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R2.java index aa313130b6b..35d71af51e8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc007_testMultipleClassRedefines_R2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.java index e244258fd50..f22a8a20c88 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_O1.java index e6733664769..1c56dce46d5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_R1.java index 5b756e989e2..0032a7bdb54 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testConstructorUpdates_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_O1.java index 9629edc09e1..3aab876192d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_R1.java index 99320ac358e..fb71b1c62ad 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testRedefineNewInstance_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_O1.java index 9ed4aba12b5..771e8365d93 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_R1.java index 22dcc00fb6f..0dee0967f60 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc008_testUpdatesToInstanceFields_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.java index 7cccac51b36..645703f0ead 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O1.java index d1b31f04e00..ce58df45371 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O2.java index 2f9edb771cb..213374af5ad 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O3.java index 56900e8f812..5c38c859a6e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_O3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_R1.java index 8da72d21ace..1f9ea0aa29e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdatesRevert_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O1.java index 131d8d68954..2c75ac3637f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O2.java index dbe92dcf271..1919a345601 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O3.java index d3775ea9c4f..ae5737d0145 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_O3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_R1.java index 67621063869..4695553d25d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc009_testInterfaceUpdates_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.java index 031200dbfce..65cdc5924a3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_O1.java index ec6dc9bf71a..04710d4c1d8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R1.java index d7d420ba1e1..9937dd17792 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R2.java index 1a3ba08d660..d7bd085126c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc010_testRedefineEnums_R2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.java index 14bf80045f7..8212ac382cc 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1a.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1a.java index 38f751bb7e2..1fcd44dfcb5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1a.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1a.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1b.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1b.java index 552c7c1f31d..722f7d02594 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1b.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I1b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I2.java index bf4338d7a91..10e1ff08706 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_I2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O1.java index bc2e7e4358b..d9e66309273 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O2.java index bbbe9e27678..d516f40d61e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O3.java index 49615ef9fc6..83b7f386432 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O4.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O4.java index 167b7b48c35..a8cf5d82621 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O4.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_O4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R1.java index 14310595b4f..5b18c846873 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R2.java index ed9adab9708..8e4a1371151 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R3.java index 653ec18249a..580cbde1d59 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R4.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R4.java index 603be4bc1a5..f28ab5948f7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R4.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testITableUpdates_R4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O1.java index 056a3243134..4a8ff00b970 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2.java index 802a829df1d..f4cc67844da 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2b.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2b.java index 0cd4c232c50..36c5af3283b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2b.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O2b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O3.java index f5e2ab4d400..c5a446bf112 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O4.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O4.java index 2128c3b9fd0..3d292966961 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O4.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O5.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O5.java index c957f45bfe5..bb311065efe 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O5.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6.java index d284cafa8c5..5135e033a0b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6b.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6b.java index 974f9803e5f..e4dcf339079 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6b.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_O6b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_R1.java index 98e080831e7..d2899e26674 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc011_testReorderingInterfaceMethods_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.java index ff45e114b39..bb75897d6c0 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_O1.java index c6cc9586027..b0ef083a16c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_R1.java index 7224d7b1027..370909a8195 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineManyRunningMethods_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_O1.java index 6b948a85951..60b21b264a6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_R1.java index 9bda6b64349..43c659479e2 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningMethod_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_O1.java index a754871af1c..38513f7ade7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_R1.java index 8a42aaf3784..3857323cc93 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc012_testRedefineRunningNativeMethod_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.java index d955cf6b792..852e09a79b7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethodsHelper.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethodsHelper.java index 6dfa247befb..6dd9551f331 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethodsHelper.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethodsHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O1.java index 820f0819e34..5b32a73c81e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O2.java index aa1cb0fc332..95fd8243d5c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_R1.java index 8a27927a4be..6b60a79b1e0 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testAddingInterfaceMethods_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O1.java index 55eb985e825..c976f06709c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O2.java index 1eeb15fdefc..217eaf00332 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_R1.java index c2a3bbe6949..ad54a42dac1 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc013_testRemovingInterfaceMethods_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.java index ff21fac1666..308b81bd4a7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_O1.java index e51a4c4336b..f4df2bc3af5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_R1.java index 37d064b41f4..75bf09e0852 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testAddFinalizer_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_O1.java index 3297698f479..87aacf8f183 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_R1.java index 47457352021..38aec4adaf8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testDeleteFinalizer_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_O1.java index 4b13ca352ed..81ae07a8a29 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_R1.java index a955b38ba13..08984eedb4c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerEmpty_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_O1.java index 4545cf1e246..a444e232a14 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_R1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_R1.java index da333af77cc..7bca7a3afce 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_R1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc014_testModifyFinalizerForwarder_R1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.java index 7fdc051c05d..bf73ded8a4b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Sub.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Sub.java index ac536dd6bc5..51ef2089057 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Sub.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Sub.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_1.java index b88c16aa5fc..3918afd311e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_2.java index 5edad022cd5..ea845004e2d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc015_testReflectMethodIDRedefine_Super_2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.java index c676ea6bd76..af54a51e56c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc016.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.java index f78e5f53a0e..b8d990ca796 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_0.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_0.java index 52cc20c0cdb..b2cbee1ea4c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_0.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_0.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_1.java index 7b96393d32a..696b3d3cdee 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_child_1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_0.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_0.java index 10bdb637073..9ec7565e61f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_0.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_0.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_1.java index 4ec7b76d912..2d665021770 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_grandParent_1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_parent.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_parent.java index 191ad684f19..180524454b4 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_parent.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc017_testClassGrandParentHierachy_parent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.java index 11f2b98d78e..28d4f5ad451 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O1.java index 57f6d6431b3..699de37c7a9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O2.java index 9d37532d49b..acb2253c172 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_O2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p1.java index e35b5fef1bb..cc716a7d241 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p2.java index b5c56d65597..a22f86d719c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc018_testRedefAndReflect_p2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Sub.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Sub.java index 2fffe6a328c..7fc9d74e40e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Sub.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Sub.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Super.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Super.java index e9370c5c7e2..c47bc192896 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Super.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019_Super.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.java index a6ef3e4169f..2792be54658 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019a.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.java index 95c11466293..0ec32f68c21 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc019b.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.java index 343514b6023..997faf3248f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_Source.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_Source.java index 00bd8485819..3271912bb86 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_Source.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_Source.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyAsmGenerator.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyAsmGenerator.java index ff9d37f12f3..47dfe501ccf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyAsmGenerator.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyAsmGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyBSMs.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyBSMs.java index dd605a2da22..2eb5cba60d4 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyBSMs.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc020_testIndyBSMs.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.java index 18f06c52c81..87889f73d52 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_O.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_O.java index 9a0ff66e36d..49da386cf1c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_O.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_O.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_R.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_R.java index 9cae4940896..cf0354674cf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_R.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotatedType_R.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_O.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_O.java index 02c53f2eb42..f2eb696bb71 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_O.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_O.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_R.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_R.java index d3086a7f877..1fd7d073df3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_R.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/redefineClasses/rc021_testAnnotationCache_R.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.redefineClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.java index a3847c57e6b..c7742270371 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V1.java index 303f5012e9d..1765d9ab351 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V2.java index ef287d71d43..31a6323e03c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Interface_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V1.java index 344d22db227..442a2a206a6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V2.java index 66b7c448a83..7bbefb69a44 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Runner_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V1.java index e9067e5cb82..a6fd5da9cc0 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V2.java index d99739edc2d..a7bbddccc80 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Sub_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Super_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Super_V1.java index 136fbda2b8e..26c613daddf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Super_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_Super_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterfaceImpl_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterfaceImpl_V1.java index d6396b252f2..609f66df618 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterfaceImpl_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterfaceImpl_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V1.java index 8c974e14de3..ec6e2c2356f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V2.java index 4d86baf7cd1..231579cea16 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassInterface_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSub_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSub_V1.java index 67a8471520d..535cbb1956e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSub_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSub_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V1.java index 56a6f49de5a..9fd3b76b3ce 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V2.java index dc7b7b962c8..5c9fe94eb7d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClassSuper_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V1.java index 32865ffa11a..d687fd8537d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V2.java index d91fe301a68..bc46b4e6994 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/registerNativesWithRetransformation/rnwr001_testClass_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.registerNativesWithRetransformation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.java index 82d4645be1f..ff867e078af 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.removeAllTags; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001Class.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001Class.java index 62b0dbed084..e40a19858f8 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001Class.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/removeAllTags/rat001Class.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.removeAllTags; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.java index 7707e4b27c6..3228a14e68e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.resourceExhausted; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re002.java index 21c5426d8cd..466ce13750f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/re002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.resourceExhausted; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/reThread.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/reThread.java index 686df5e58ab..5b50e90c7cf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/reThread.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/resourceExhausted/reThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.resourceExhausted; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.java index 53675440267..2c6133cbcab 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001_testUnsafe.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001_testUnsafe.java index 8f44dbd5224..3aa8b51b851 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001_testUnsafe.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc001_testUnsafe.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.java index e300bfc4c25..9ea7341289e 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_annotation.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_annotation.java index 8ff23357ff3..d6a4652a59f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_annotation.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_annotation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsA.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsA.java index 3906923d279..6a53a81fadc 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsA.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsA.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsB.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsB.java index 02379f5270b..e9ba5d116fa 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsB.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc002_runtimeTypeVisibleAnnotationsB.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc003.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc003.java index 852924f820c..4637c1fbbb6 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc003.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformClasses/rtc003.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformClasses; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.java index c2e622f6681..60103348ad7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V1.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V1.java index 7b49211ef52..ef096520a5b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V1.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V2.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V2.java index d50c74f3a40..a1c5efe4012 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V2.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V3.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V3.java index a85b1c6b674..0c7221a9714 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V3.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V4.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V4.java index f381b316999..852c1135cc2 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V4.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V5.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V5.java index 92eb14cbc13..cc5ef6f4d89 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V5.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V6.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V6.java index 7bffed230a0..824a716bfc7 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V6.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/retransformRedefineCombo/rrc001_testClass_V6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.retransformRedefineCombo; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.java index 2f30dc17b85..53c2546dca4 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/samplingObjectAllocation/soae001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.samplingObjectAllocation; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.java index 1cdff9635b8..6baf31d292d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/setNativeMethodPrefix/snmp001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.setNativeMethodPrefix; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.java index e574bcdfdd0..33b5966d054 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/sharedCacheAPI/sca001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.sharedCacheAPI; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.java index 84882947baf..82d7a83a218 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.traceSubscription; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.java index 32b32575f3c..a8f594460c3 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/traceSubscription/ts002.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.traceSubscription; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentHardException.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentHardException.java index 38cfedd3090..63f4b0b03bd 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentHardException.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentHardException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentSoftException.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentSoftException.java index 0ffd0c70364..4f40dd9d76b 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentSoftException.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/AgentSoftException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/CustomClassLoader.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/CustomClassLoader.java index f94366666e9..ed64dc910bd 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/CustomClassLoader.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/CustomClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Error.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Error.java index c7fa04c0336..a3f2dead79c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Error.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Error.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/ErrorControl.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/ErrorControl.java index 3c0c55b86ab..4caea4a4cdb 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/ErrorControl.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/ErrorControl.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SubTest.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SubTest.java index df92b8fb614..40a08691b7f 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SubTest.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SubTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SyncThread.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SyncThread.java index 175f1fd7504..b9d9f2530d5 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SyncThread.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/SyncThread.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestCase.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestCase.java index 833fdd8e9ef..3bd69be81de 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestCase.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestCase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestRunner.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestRunner.java index e600d6bd9ff..c14635a3424 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestRunner.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestRunner.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestSuite.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestSuite.java index 3a027396962..cc72a7da7d9 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestSuite.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/TestSuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Util.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Util.java index fd220e5aa4e..5883aa9c1ac 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Util.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/Util.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java index 70e58ddbf10..20e1013087d 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/util/attachingAgent.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.util; import com.sun.tools.attach.VirtualMachine; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.java index f2e5d84aeb9..213e518393c 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/verboseGC/vgc001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.verboseGC; diff --git a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.java b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.java index 75f179b1156..967aa4d0538 100644 --- a/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.java +++ b/test/functional/cmdLineTests/jvmtitests/src/com/ibm/jvmti/tests/vmDump/vmd001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.vmDump; diff --git a/test/functional/cmdLineTests/jvmtitests/src_current/com/ibm/jvmti/tests/modularityTests/mt001.java b/test/functional/cmdLineTests/jvmtitests/src_current/com/ibm/jvmti/tests/modularityTests/mt001.java index a9d20ce5383..a476248f058 100644 --- a/test/functional/cmdLineTests/jvmtitests/src_current/com/ibm/jvmti/tests/modularityTests/mt001.java +++ b/test/functional/cmdLineTests/jvmtitests/src_current/com/ibm/jvmti/tests/modularityTests/mt001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.modularityTests; diff --git a/test/functional/cmdLineTests/jvmtitests/src_latest/com/ibm/jvmti/tests/modularityTests/mt001.java b/test/functional/cmdLineTests/jvmtitests/src_latest/com/ibm/jvmti/tests/modularityTests/mt001.java index 8e5721ea21d..91552d4e9cf 100644 --- a/test/functional/cmdLineTests/jvmtitests/src_latest/com/ibm/jvmti/tests/modularityTests/mt001.java +++ b/test/functional/cmdLineTests/jvmtitests/src_latest/com/ibm/jvmti/tests/modularityTests/mt001.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.jvmti.tests.modularityTests; diff --git a/test/functional/cmdLineTests/jython/build.xml b/test/functional/cmdLineTests/jython/build.xml index d2bb4072d4f..b5d26d4ac44 100644 --- a/test/functional/cmdLineTests/jython/build.xml +++ b/test/functional/cmdLineTests/jython/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jython/jython.xml b/test/functional/cmdLineTests/jython/jython.xml index 9db0ca7a87f..73a928927e3 100644 --- a/test/functional/cmdLineTests/jython/jython.xml +++ b/test/functional/cmdLineTests/jython/jython.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/jython/playlist.xml b/test/functional/cmdLineTests/jython/playlist.xml index 7e3a2fa3aff..597459f662e 100644 --- a/test/functional/cmdLineTests/jython/playlist.xml +++ b/test/functional/cmdLineTests/jython/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/jython/src/JythonHello.java b/test/functional/cmdLineTests/jython/src/JythonHello.java index ee2feeda098..d39893468a0 100644 --- a/test/functional/cmdLineTests/jython/src/JythonHello.java +++ b/test/functional/cmdLineTests/jython/src/JythonHello.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import org.python.core.PyList; import org.python.core.PyObject; diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/build.xml b/test/functional/cmdLineTests/lazyClassLoadingTest/build.xml index a942d23bea6..9c3ed4837a3 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/build.xml +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/lazyClassLoading.xml b/test/functional/cmdLineTests/lazyClassLoadingTest/lazyClassLoading.xml index bd7d2578cfe..cbdf58da1d1 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/lazyClassLoading.xml +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/lazyClassLoading.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/playlist.xml b/test/functional/cmdLineTests/lazyClassLoadingTest/playlist.xml index 2366bce3207..148f0a49d41 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/playlist.xml +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/ClassLoaderTest.java b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/ClassLoaderTest.java index beaf26a15b2..4213864b8a8 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/ClassLoaderTest.java +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/ClassLoaderTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classloader; diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/Dummy.java b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/Dummy.java index e4323c252ce..d09a40e0563 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/Dummy.java +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classloader; diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/EmptyClassLoader.java b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/EmptyClassLoader.java index b3f60aadcb2..cb40f2be86b 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/EmptyClassLoader.java +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/EmptyClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classloader; diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/LazyClassLoaderInitTest.java b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/LazyClassLoaderInitTest.java index 07e3e700fa5..9e756cbec2b 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/LazyClassLoaderInitTest.java +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/LazyClassLoaderInitTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classloader; diff --git a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/MyClassLoader.java b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/MyClassLoader.java index 0f15cc6c2e8..87971ab9e5a 100644 --- a/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/MyClassLoader.java +++ b/test/functional/cmdLineTests/lazyClassLoadingTest/src/j9vm/test/classloader/MyClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.classloader; diff --git a/test/functional/cmdLineTests/libpathTest/build.xml b/test/functional/cmdLineTests/libpathTest/build.xml index 27d0bdc8220..c06f99fa6e7 100644 --- a/test/functional/cmdLineTests/libpathTest/build.xml +++ b/test/functional/cmdLineTests/libpathTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/libpathTest/exclude.xml b/test/functional/cmdLineTests/libpathTest/exclude.xml index 09caa22c116..e9ba949d9a2 100644 --- a/test/functional/cmdLineTests/libpathTest/exclude.xml +++ b/test/functional/cmdLineTests/libpathTest/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/libpathTest/exclude_rtfchild.xml b/test/functional/cmdLineTests/libpathTest/exclude_rtfchild.xml index 7ad254b3ed4..545a022c396 100644 --- a/test/functional/cmdLineTests/libpathTest/exclude_rtfchild.xml +++ b/test/functional/cmdLineTests/libpathTest/exclude_rtfchild.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/libpathTest/libpathRtf.xml b/test/functional/cmdLineTests/libpathTest/libpathRtf.xml index 799a98b6044..cb31b9641f0 100644 --- a/test/functional/cmdLineTests/libpathTest/libpathRtf.xml +++ b/test/functional/cmdLineTests/libpathTest/libpathRtf.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/libpathTest/libpathRtfChild.xml b/test/functional/cmdLineTests/libpathTest/libpathRtfChild.xml index 3b7d8f39fe9..bae2ba919bf 100644 --- a/test/functional/cmdLineTests/libpathTest/libpathRtfChild.xml +++ b/test/functional/cmdLineTests/libpathTest/libpathRtfChild.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/libpathTest/playlist.xml b/test/functional/cmdLineTests/libpathTest/playlist.xml index f3e8e1f00bd..b65ac735d25 100644 --- a/test/functional/cmdLineTests/libpathTest/playlist.xml +++ b/test/functional/cmdLineTests/libpathTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/Rtf.java b/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/Rtf.java index 3c1b2a9688d..dfc24c5e3ed 100644 --- a/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/Rtf.java +++ b/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/Rtf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.libpath; diff --git a/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/RtfChild.java b/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/RtfChild.java index 2580e5fd928..af94ebdbd8c 100644 --- a/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/RtfChild.java +++ b/test/functional/cmdLineTests/libpathTest/src/org/openj9/test/libpath/RtfChild.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.libpath; diff --git a/test/functional/cmdLineTests/loadLibraryTest/build.xml b/test/functional/cmdLineTests/loadLibraryTest/build.xml index 9373ec34f10..80dbf3fba2d 100644 --- a/test/functional/cmdLineTests/loadLibraryTest/build.xml +++ b/test/functional/cmdLineTests/loadLibraryTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/loadLibraryTest/loadLibraryTest.xml b/test/functional/cmdLineTests/loadLibraryTest/loadLibraryTest.xml index c271acdce38..f4c9ab22421 100644 --- a/test/functional/cmdLineTests/loadLibraryTest/loadLibraryTest.xml +++ b/test/functional/cmdLineTests/loadLibraryTest/loadLibraryTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/loadLibraryTest/playlist.xml b/test/functional/cmdLineTests/loadLibraryTest/playlist.xml index cb21dfe9990..895b4a95d4d 100644 --- a/test/functional/cmdLineTests/loadLibraryTest/playlist.xml +++ b/test/functional/cmdLineTests/loadLibraryTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/loadLibraryTest/src/org/openj9/test/loadLibrary/TestLoadLibrary.java b/test/functional/cmdLineTests/loadLibraryTest/src/org/openj9/test/loadLibrary/TestLoadLibrary.java index 6a932a4b159..8e97caaa67e 100644 --- a/test/functional/cmdLineTests/loadLibraryTest/src/org/openj9/test/loadLibrary/TestLoadLibrary.java +++ b/test/functional/cmdLineTests/loadLibraryTest/src/org/openj9/test/loadLibrary/TestLoadLibrary.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.loadLibrary; diff --git a/test/functional/cmdLineTests/locales/build.xml b/test/functional/cmdLineTests/locales/build.xml index 36f187e48e5..d68f2758fda 100644 --- a/test/functional/cmdLineTests/locales/build.xml +++ b/test/functional/cmdLineTests/locales/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/locales/locales.xml b/test/functional/cmdLineTests/locales/locales.xml index fbae7da543c..bd8ea106645 100644 --- a/test/functional/cmdLineTests/locales/locales.xml +++ b/test/functional/cmdLineTests/locales/locales.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/locales/playlist.xml b/test/functional/cmdLineTests/locales/playlist.xml index e35aea0fdf6..6c3b306a578 100644 --- a/test/functional/cmdLineTests/locales/playlist.xml +++ b/test/functional/cmdLineTests/locales/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/locales/run_all_locales.sh b/test/functional/cmdLineTests/locales/run_all_locales.sh index 7daf7e96b64..1809b3b8dec 100755 --- a/test/functional/cmdLineTests/locales/run_all_locales.sh +++ b/test/functional/cmdLineTests/locales/run_all_locales.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # don't try ZOS xplink and lp64 locales diff --git a/test/functional/cmdLineTests/lockWordAlignment/alignment.xml b/test/functional/cmdLineTests/lockWordAlignment/alignment.xml index 0fbcea99c3a..5271cd4e60a 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/alignment.xml +++ b/test/functional/cmdLineTests/lockWordAlignment/alignment.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/lockWordAlignment/build.xml b/test/functional/cmdLineTests/lockWordAlignment/build.xml index 0beb758de69..c860f36bce2 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/build.xml +++ b/test/functional/cmdLineTests/lockWordAlignment/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/lockWordAlignment/playlist.xml b/test/functional/cmdLineTests/lockWordAlignment/playlist.xml index 39c1d840f42..528dad70237 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/playlist.xml +++ b/test/functional/cmdLineTests/lockWordAlignment/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/CreateTestObjectJar.java b/test/functional/cmdLineTests/lockWordAlignment/src/CreateTestObjectJar.java index 52fd6379c15..0707294315a 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/CreateTestObjectJar.java +++ b/test/functional/cmdLineTests/lockWordAlignment/src/CreateTestObjectJar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.IllegalArgumentException; diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/IntLongObjectAlignmentTestGenerator.java b/test/functional/cmdLineTests/lockWordAlignment/src/IntLongObjectAlignmentTestGenerator.java index fb6fe27df10..e73c4f45494 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/IntLongObjectAlignmentTestGenerator.java +++ b/test/functional/cmdLineTests/lockWordAlignment/src/IntLongObjectAlignmentTestGenerator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE; diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/README b/test/functional/cmdLineTests/lockWordAlignment/src/README index 0e65e54e7b5..d66e2450506 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/README +++ b/test/functional/cmdLineTests/lockWordAlignment/src/README @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * -* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ******************************************************************************* # This generates alignment test material diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/level_2_I.java b/test/functional/cmdLineTests/lockWordAlignment/src/level_2_I.java index 75db855fbd6..e4921a9390e 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/level_2_I.java +++ b/test/functional/cmdLineTests/lockWordAlignment/src/level_2_I.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import sun.misc.Unsafe; diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/level_2_J.java b/test/functional/cmdLineTests/lockWordAlignment/src/level_2_J.java index c0d7b18a75a..21eb74e750c 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/level_2_J.java +++ b/test/functional/cmdLineTests/lockWordAlignment/src/level_2_J.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import sun.misc.Unsafe; diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/level_2_O.java b/test/functional/cmdLineTests/lockWordAlignment/src/level_2_O.java index ee957799679..22373275bee 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/level_2_O.java +++ b/test/functional/cmdLineTests/lockWordAlignment/src/level_2_O.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import sun.misc.Unsafe; diff --git a/test/functional/cmdLineTests/lockWordAlignment/src/main.java b/test/functional/cmdLineTests/lockWordAlignment/src/main.java index 92d082afab0..b3569f349e7 100644 --- a/test/functional/cmdLineTests/lockWordAlignment/src/main.java +++ b/test/functional/cmdLineTests/lockWordAlignment/src/main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import sun.misc.Unsafe; diff --git a/test/functional/cmdLineTests/loopReduction/build.xml b/test/functional/cmdLineTests/loopReduction/build.xml index 26de42f3b93..26611d283f6 100644 --- a/test/functional/cmdLineTests/loopReduction/build.xml +++ b/test/functional/cmdLineTests/loopReduction/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/loopReduction/loopReduction.xml b/test/functional/cmdLineTests/loopReduction/loopReduction.xml index 9f546a434df..889dcc2de87 100644 --- a/test/functional/cmdLineTests/loopReduction/loopReduction.xml +++ b/test/functional/cmdLineTests/loopReduction/loopReduction.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/loopReduction/playlist.xml b/test/functional/cmdLineTests/loopReduction/playlist.xml index d2281a2231f..dccdf8b7728 100644 --- a/test/functional/cmdLineTests/loopReduction/playlist.xml +++ b/test/functional/cmdLineTests/loopReduction/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/modularityddrtests/build.xml b/test/functional/cmdLineTests/modularityddrtests/build.xml index 52ec9994187..63cc7b84c08 100644 --- a/test/functional/cmdLineTests/modularityddrtests/build.xml +++ b/test/functional/cmdLineTests/modularityddrtests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/modularityddrtests/exclude.xml b/test/functional/cmdLineTests/modularityddrtests/exclude.xml index 91ee51a3c79..40fe3fa14bf 100644 --- a/test/functional/cmdLineTests/modularityddrtests/exclude.xml +++ b/test/functional/cmdLineTests/modularityddrtests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/modularityddrtests/modularityddrtests11.xml b/test/functional/cmdLineTests/modularityddrtests/modularityddrtests11.xml index 2b2c08ac099..a26491001ab 100644 --- a/test/functional/cmdLineTests/modularityddrtests/modularityddrtests11.xml +++ b/test/functional/cmdLineTests/modularityddrtests/modularityddrtests11.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/modularityddrtests/modularityddrtests17.xml b/test/functional/cmdLineTests/modularityddrtests/modularityddrtests17.xml index a570f530b12..758ab8542f3 100644 --- a/test/functional/cmdLineTests/modularityddrtests/modularityddrtests17.xml +++ b/test/functional/cmdLineTests/modularityddrtests/modularityddrtests17.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/modularityddrtests/playlist.xml b/test/functional/cmdLineTests/modularityddrtests/playlist.xml index b7ea7ec7975..2bdc18bbba0 100644 --- a/test/functional/cmdLineTests/modularityddrtests/playlist.xml +++ b/test/functional/cmdLineTests/modularityddrtests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/openssl/build.xml b/test/functional/cmdLineTests/openssl/build.xml index 221b48d6403..b1b1508e649 100644 --- a/test/functional/cmdLineTests/openssl/build.xml +++ b/test/functional/cmdLineTests/openssl/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/openssl/openssl.xml b/test/functional/cmdLineTests/openssl/openssl.xml index cf6967e3f48..b044ef3af30 100644 --- a/test/functional/cmdLineTests/openssl/openssl.xml +++ b/test/functional/cmdLineTests/openssl/openssl.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/openssl/playlist.xml b/test/functional/cmdLineTests/openssl/playlist.xml index 2755574b62d..609860b086f 100644 --- a/test/functional/cmdLineTests/openssl/playlist.xml +++ b/test/functional/cmdLineTests/openssl/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/openssl/src/org/openj9/test/openssl/CryptoTest.java b/test/functional/cmdLineTests/openssl/src/org/openj9/test/openssl/CryptoTest.java index 07037062896..7c52b93b7df 100644 --- a/test/functional/cmdLineTests/openssl/src/org/openj9/test/openssl/CryptoTest.java +++ b/test/functional/cmdLineTests/openssl/src/org/openj9/test/openssl/CryptoTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.openssl; diff --git a/test/functional/cmdLineTests/pageAlignDirectMemory/PageAlignDirectMemory.xml b/test/functional/cmdLineTests/pageAlignDirectMemory/PageAlignDirectMemory.xml index d9f0ff24dc3..61cf36f8be9 100644 --- a/test/functional/cmdLineTests/pageAlignDirectMemory/PageAlignDirectMemory.xml +++ b/test/functional/cmdLineTests/pageAlignDirectMemory/PageAlignDirectMemory.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/pageAlignDirectMemory/build.xml b/test/functional/cmdLineTests/pageAlignDirectMemory/build.xml index 9ea4644e692..f3cf70dabee 100644 --- a/test/functional/cmdLineTests/pageAlignDirectMemory/build.xml +++ b/test/functional/cmdLineTests/pageAlignDirectMemory/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/pageAlignDirectMemory/playlist.xml b/test/functional/cmdLineTests/pageAlignDirectMemory/playlist.xml index 9219d0a8bcc..82b9e1084b0 100644 --- a/test/functional/cmdLineTests/pageAlignDirectMemory/playlist.xml +++ b/test/functional/cmdLineTests/pageAlignDirectMemory/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/pltest/build.xml b/test/functional/cmdLineTests/pltest/build.xml index 51ac06144c7..5d3c9959caf 100644 --- a/test/functional/cmdLineTests/pltest/build.xml +++ b/test/functional/cmdLineTests/pltest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/pltest/j9tty_extended.xml b/test/functional/cmdLineTests/pltest/j9tty_extended.xml index d00b9bf7225..69d763d3567 100644 --- a/test/functional/cmdLineTests/pltest/j9tty_extended.xml +++ b/test/functional/cmdLineTests/pltest/j9tty_extended.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/pltest/playlist.xml b/test/functional/cmdLineTests/pltest/playlist.xml index cf87ee05952..e82db786ae8 100644 --- a/test/functional/cmdLineTests/pltest/playlist.xml +++ b/test/functional/cmdLineTests/pltest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/pltest/pltest.xml b/test/functional/cmdLineTests/pltest/pltest.xml index 06b7b891750..75cf370faf2 100644 --- a/test/functional/cmdLineTests/pltest/pltest.xml +++ b/test/functional/cmdLineTests/pltest/pltest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/pltest/pltest_numcpus_bound.xml b/test/functional/cmdLineTests/pltest/pltest_numcpus_bound.xml index 4006bf9307f..ed4db6f84fe 100644 --- a/test/functional/cmdLineTests/pltest/pltest_numcpus_bound.xml +++ b/test/functional/cmdLineTests/pltest/pltest_numcpus_bound.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/proxyFieldAccess/build.xml b/test/functional/cmdLineTests/proxyFieldAccess/build.xml index 65c12054980..25cee965b3d 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/build.xml +++ b/test/functional/cmdLineTests/proxyFieldAccess/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/proxyFieldAccess/playlist.xml b/test/functional/cmdLineTests/proxyFieldAccess/playlist.xml index adc9ded0754..56508017067 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/playlist.xml +++ b/test/functional/cmdLineTests/proxyFieldAccess/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/MyClassLoader.java b/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/MyClassLoader.java index a02d3204f2a..1dc1f7a592e 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/MyClassLoader.java +++ b/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/MyClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package defect.cmvc198986; diff --git a/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/ProxyFieldAccess.java b/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/ProxyFieldAccess.java index 58c63e6407e..547248b4e97 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/ProxyFieldAccess.java +++ b/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/ProxyFieldAccess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package defect.cmvc198986; diff --git a/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/TestProxyFieldAccess.java b/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/TestProxyFieldAccess.java index 87505af2ce9..01de68dd242 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/TestProxyFieldAccess.java +++ b/test/functional/cmdLineTests/proxyFieldAccess/src/defect/cmvc198986/TestProxyFieldAccess.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package defect.cmvc198986; diff --git a/test/functional/cmdLineTests/proxyFieldAccess/src/java/util/$Proxy0.java b/test/functional/cmdLineTests/proxyFieldAccess/src/java/util/$Proxy0.java index 597afc5c84b..433acbb7cb8 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/src/java/util/$Proxy0.java +++ b/test/functional/cmdLineTests/proxyFieldAccess/src/java/util/$Proxy0.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package java.util; diff --git a/test/functional/cmdLineTests/proxyFieldAccess/testproxyfieldaccess.xml b/test/functional/cmdLineTests/proxyFieldAccess/testproxyfieldaccess.xml index 61032c19ba4..48c8fe0efe0 100644 --- a/test/functional/cmdLineTests/proxyFieldAccess/testproxyfieldaccess.xml +++ b/test/functional/cmdLineTests/proxyFieldAccess/testproxyfieldaccess.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/reflectCache/build.xml b/test/functional/cmdLineTests/reflectCache/build.xml index 96293aea998..ce47fbc1368 100644 --- a/test/functional/cmdLineTests/reflectCache/build.xml +++ b/test/functional/cmdLineTests/reflectCache/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/reflectCache/playlist.xml b/test/functional/cmdLineTests/reflectCache/playlist.xml index 13c5edae8cb..724215c3495 100644 --- a/test/functional/cmdLineTests/reflectCache/playlist.xml +++ b/test/functional/cmdLineTests/reflectCache/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/reflectCache/reflectcache_exclude.xml b/test/functional/cmdLineTests/reflectCache/reflectcache_exclude.xml index b5f0f40dee6..a21868353f7 100644 --- a/test/functional/cmdLineTests/reflectCache/reflectcache_exclude.xml +++ b/test/functional/cmdLineTests/reflectCache/reflectcache_exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/reflectCache/reflectcache_test.xml b/test/functional/cmdLineTests/reflectCache/reflectcache_test.xml index eb1130ca202..284c452301c 100644 --- a/test/functional/cmdLineTests/reflectCache/reflectcache_test.xml +++ b/test/functional/cmdLineTests/reflectCache/reflectcache_test.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/reflectCache/src/test/reflectCache/Test.java b/test/functional/cmdLineTests/reflectCache/src/test/reflectCache/Test.java index d149cd3238b..9f4c819f0c2 100644 --- a/test/functional/cmdLineTests/reflectCache/src/test/reflectCache/Test.java +++ b/test/functional/cmdLineTests/reflectCache/src/test/reflectCache/Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package test.reflectCache; diff --git a/test/functional/cmdLineTests/reflectCache/src_15/test/reflectCache/Test_ReflectCache.java b/test/functional/cmdLineTests/reflectCache/src_15/test/reflectCache/Test_ReflectCache.java index d7108497469..2f9d3df797d 100644 --- a/test/functional/cmdLineTests/reflectCache/src_15/test/reflectCache/Test_ReflectCache.java +++ b/test/functional/cmdLineTests/reflectCache/src_15/test/reflectCache/Test_ReflectCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package test.reflectCache; diff --git a/test/functional/cmdLineTests/reflectCache/src_8/test/reflectCache/Test_ReflectCache.java b/test/functional/cmdLineTests/reflectCache/src_8/test/reflectCache/Test_ReflectCache.java index 5d2f40523f5..77aa494d19f 100644 --- a/test/functional/cmdLineTests/reflectCache/src_8/test/reflectCache/Test_ReflectCache.java +++ b/test/functional/cmdLineTests/reflectCache/src_8/test/reflectCache/Test_ReflectCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package test.reflectCache; diff --git a/test/functional/cmdLineTests/runtimemxbeanTests/build.xml b/test/functional/cmdLineTests/runtimemxbeanTests/build.xml index b8dba42ee38..1c2cce7246c 100644 --- a/test/functional/cmdLineTests/runtimemxbeanTests/build.xml +++ b/test/functional/cmdLineTests/runtimemxbeanTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.pl b/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.pl index fad6814e96c..1cd510d00ab 100644 --- a/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.pl +++ b/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.pl @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## use strict; diff --git a/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.xml b/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.xml index 495e8cc7ba7..dc88120fde8 100644 --- a/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.xml +++ b/test/functional/cmdLineTests/runtimemxbeanTests/getPidTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/runtimemxbeanTests/playlist.xml b/test/functional/cmdLineTests/runtimemxbeanTests/playlist.xml index 1d5f97774cc..b2083e4eadb 100644 --- a/test/functional/cmdLineTests/runtimemxbeanTests/playlist.xml +++ b/test/functional/cmdLineTests/runtimemxbeanTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/runtimemxbeanTests/src/GetPid.java b/test/functional/cmdLineTests/runtimemxbeanTests/src/GetPid.java index bd15daedab0..48678f3f78b 100644 --- a/test/functional/cmdLineTests/runtimemxbeanTests/src/GetPid.java +++ b/test/functional/cmdLineTests/runtimemxbeanTests/src/GetPid.java @@ -18,7 +18,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.lang.management.RuntimeMXBean; diff --git a/test/functional/cmdLineTests/runtimemxbeanTests/variables.mk b/test/functional/cmdLineTests/runtimemxbeanTests/variables.mk index 470b52d44a4..06d49eae664 100644 --- a/test/functional/cmdLineTests/runtimemxbeanTests/variables.mk +++ b/test/functional/cmdLineTests/runtimemxbeanTests/variables.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## FS=/ diff --git a/test/functional/cmdLineTests/shareClassTests/BadStackMap/build.xml b/test/functional/cmdLineTests/shareClassTests/BadStackMap/build.xml index 7cb68515b8b..681f350de21 100644 --- a/test/functional/cmdLineTests/shareClassTests/BadStackMap/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/BadStackMap/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/BadStackMap/playlist.xml b/test/functional/cmdLineTests/shareClassTests/BadStackMap/playlist.xml index b6d23f04383..99a18c1cd66 100644 --- a/test/functional/cmdLineTests/shareClassTests/BadStackMap/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/BadStackMap/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/BadStackMap/shareClassesBadStackMap.xml b/test/functional/cmdLineTests/shareClassTests/BadStackMap/shareClassesBadStackMap.xml index 534409c8965..fd68ea95d41 100644 --- a/test/functional/cmdLineTests/shareClassTests/BadStackMap/shareClassesBadStackMap.xml +++ b/test/functional/cmdLineTests/shareClassTests/BadStackMap/shareClassesBadStackMap.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/BadStackMap/src/ShareClassesBadStackMapTest.java b/test/functional/cmdLineTests/shareClassTests/BadStackMap/src/ShareClassesBadStackMapTest.java index 4d00d55649c..f6764670da3 100644 --- a/test/functional/cmdLineTests/shareClassTests/BadStackMap/src/ShareClassesBadStackMapTest.java +++ b/test/functional/cmdLineTests/shareClassTests/BadStackMap/src/ShareClassesBadStackMapTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class ShareClassesBadStackMapTest { public static void main(String[] paramArrayOfString) { diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests.xml b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests.xml index 00bb23a4ce3..444e6daf041 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests_8.xml b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests_8.xml index 774d17a0c42..b98be7a62d0 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests_8.xml +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/DataHelperTests_8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/build.xml b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/build.xml index b8143eec1f7..a6714345efe 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/exclude.xml b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/exclude.xml index 28e6d6f7ae8..e685675916c 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/exclude.xml +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/playlist.xml index e5a7b3fc77c..66b60677932 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/CustomClassloaders/DataCachingClassLoader.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/CustomClassloaders/DataCachingClassLoader.java index 03cd93b39e8..980ddc9b552 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/CustomClassloaders/DataCachingClassLoader.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/CustomClassloaders/DataCachingClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomClassloaders; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/GlobalConstants.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/GlobalConstants.java index a67b10d3a28..889c6c8dd26 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/GlobalConstants.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/GlobalConstants.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/TestFailedException.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/TestFailedException.java index 9bfd0b72e06..b12e60fcbc6 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/TestFailedException.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/TestFailedException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/Testbase.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/Testbase.java index c3a4e3e890e..e025fbbf3b9 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/Testbase.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/Testbase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest01.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest01.java index 538836d41ad..689d0e5812e 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest01.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest01.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest02.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest02.java index 20c7e8dc267..db586dc0fe7 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest02.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest02.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest03.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest03.java index 09f4c3dcefc..e38a09911a1 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest03.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest03.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest04.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest04.java index b022cd4fcc8..76a7337557e 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest04.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest04.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest05.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest05.java index afbdaefdb8c..ce48ccd518c 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest05.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest05.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest06.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest06.java index ffbbc22d39f..8315ce550e9 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest06.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTest06.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTestbase.java b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTestbase.java index 4104432881b..e586dfc4a3c 100644 --- a/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTestbase.java +++ b/test/functional/cmdLineTests/shareClassTests/DataHelperTests/src/apitesting/datahelper/DataCachingTestbase.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package apitesting.datahelper; diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/HelloWorld.java b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/HelloWorld.java index e8f7f00426b..e4ecbb54ae4 100644 --- a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/HelloWorld.java +++ b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/HelloWorld.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class HelloWorld diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/build.xml b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/build.xml index 7a94b70be0d..24c973291bf 100644 --- a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/exclude.xml b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/exclude.xml index 5f0a38ddc74..6ac22854911 100644 --- a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/exclude.xml +++ b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/expireAndListAllCachesTests.xml b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/expireAndListAllCachesTests.xml index e58a6006e83..9dbdbff7ff3 100644 --- a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/expireAndListAllCachesTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/expireAndListAllCachesTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/listAllCachesTests.xml b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/listAllCachesTests.xml index affa086a548..697fdb2f15d 100644 --- a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/listAllCachesTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/listAllCachesTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/playlist.xml index 2aa4bec1b8d..faf9694e6b1 100644 --- a/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/ListAllCachesTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLOpenJ9.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLOpenJ9.xml index b6ecaa542c8..c48fd31d20c 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLOpenJ9.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLOpenJ9.xml @@ -14,7 +14,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-1.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-1.xml index c0f7237e238..7a355ac4af5 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-1.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-1.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-2.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-2.xml index ffc1a073769..0e26184404c 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-2.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-2.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-3.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-3.xml index 797a2fad0c8..f4ffef05cf9 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-3.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-3.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-4.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-4.xml index 0d1c903f1f8..fe1b8702224 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-4.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-4.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-5.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-5.xml index 616cbddf079..2ca0f6d700d 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-5.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-5.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml index 7b794d1a3f4..89b322076e6 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/SharedClassesModularityTests.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/SharedClassesModularityTests.xml index 757affbbaf9..59bd0fda44f 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/SharedClassesModularityTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/SharedClassesModularityTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/build.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/build.xml index ced47254f1b..0f0c12286b2 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude.xml index 77545c836ca..c03f0a3f4ca 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude_openj9.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude_openj9.xml index 61b1783b9bd..ed9e1aaafd5 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude_openj9.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/exclude_openj9.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml index 46a1dd977b9..8f07827c0ad 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLAotMethodOperation.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLAotMethodOperation.xml index 4fa25617bb2..d8fa1dcfe07 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLAotMethodOperation.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLAotMethodOperation.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSnapshot.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSnapshot.xml index 2d51c8d339b..ed671b506b0 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSnapshot.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSnapshot.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSoftmx.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSoftmx.xml index 298e65c225b..06e0393d5c5 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSoftmx.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/testSCCMLSoftmx.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/CommandLineOptionTests.xml b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/CommandLineOptionTests.xml index a5adbdbce44..6cd5fa6da74 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/CommandLineOptionTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/CommandLineOptionTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/HelloWorld.java b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/HelloWorld.java index fbaacd67991..90826b70b47 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/HelloWorld.java +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/HelloWorld.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class HelloWorld diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/SimpleGrep.java b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/SimpleGrep.java index e849c0e8c08..29944b2c10e 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/SimpleGrep.java +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/SimpleGrep.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.bat index f8420a62bfc..0dadae7ac2a 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.sh index ed53f621a36..bad8f0018a9 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.bat index 2f223c0b573..ecf03a2b3ba 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.sh index 672a9656da1..62414ad9970 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption2.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.bat index e987065c3e1..17072f5040d 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.sh index 010c7595341..00d94f85c03 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption3.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.bat index 0077c18a583..c90825aa705 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.sh index 94478823f9a..333212d3646 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption4.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.bat index 4000c8f4b0b..458013a59c8 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.sh index 81eef2cfb1d..0ebe5027525 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/XscmxOption5.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/build.xml b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/build.xml index 63427d101ee..bdf729a3cdc 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.bat index 64d75a86148..f3b24ae5241 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.sh index 353e3b83b2f..eefe0ef0cb5 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/cmdlineConfig.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude.xml b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude.xml index d92bf74f044..4699ca5d6d4 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/excludeUnitTest.xml b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/excludeUnitTest.xml index 58f4b09ac0e..792650d9e61 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/excludeUnitTest.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/excludeUnitTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude_11.xml b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude_11.xml index a24e677d903..42fdec3b9c6 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude_11.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/exclude_11.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.bat index 434ca7d2d36..9a75256d23c 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.sh index e44af1b8aa8..97c90b557d8 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/modifiedOption.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.bat index 1e5b549012c..cfa15e3e527 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.sh index 783a1f4b55c..6e5260acdaf 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.bat index 353646ada61..64d01ab0944 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.sh index 802104ae029..998151f2a7b 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption10.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.bat index a4bdf3e07db..16befceeffe 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.sh index 94ed2da73cf..3c23233c8fb 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption11.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.bat index 6d386293d10..5bc95641704 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.sh index 27a216cb97b..3d09e36d09e 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption12.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.bat index e43f6507161..93e8b0d8bed 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.sh index 754c5f31e48..668bfe5eb1b 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption13.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption14.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption14.pl index 8e4a207e7f7..8ebdb5b1dd5 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption14.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption14.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption15.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption15.pl index 9d79ad8ea4c..0129094dddd 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption15.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption15.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption16.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption16.pl index 1918da820c3..28dc3cdd830 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption16.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption16.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption17.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption17.pl index 426ab67054e..5da036225ac 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption17.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption17.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption18.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption18.pl index e9af587540e..ca8f2c0940c 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption18.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption18.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption19.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption19.pl index 4069b6b229c..b0a140f4f5e 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption19.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption19.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.bat index e4df62e9147..54ecad8e98d 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.sh index f9c5b06664a..1a3e6819750 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption2.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.bat index c0aaa3fd495..535c63878c2 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.sh index e0fdfe0e514..17a0344d863 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption3.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.bat index a63fb94d0f8..b0d9ef937a3 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.sh index 4baa134104d..2ff460a4171 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption4.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.bat index cafb243523a..f29fbc17aff 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.sh index 559e3072638..a2298af6bc0 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption5.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.bat index 0bc3aacee3e..7303f447f2c 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.sh index 56810ec9d31..281cb44df7b 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption6.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.bat index 3d53e5c86ae..f9b6d5c7b9e 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.sh index e9d6e555b6e..708dd9104bd 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption7.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.bat index 21834533c30..71c8803e608 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.sh index 806df60eeb6..54fdcab1675 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption8.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.bat index 5d28c8c2c4c..a77c00a8786 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.sh index 6a77dcbd17a..18d5493a0b3 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/nameOption9.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/playlist.xml index c82fddac347..b52ab4eeae7 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/sharedClassesUtil.pl b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/sharedClassesUtil.pl index f30c09c416f..dd62b4c9e7f 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/sharedClassesUtil.pl +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/sharedClassesUtil.pl @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.bat index a0f80414592..8d1fd315787 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.sh index c0410ff1201..35592749948 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.bat index 7379dbe579b..8c0d337df2d 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.sh index 33f912c0a3b..f264e678841 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/silentOption2.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.bat b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.bat index a64c6741cda..3f029e73d6a 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.bat +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.bat @@ -19,7 +19,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.sh b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.sh index 3d6f927d9f4..336139f6e8f 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.sh +++ b/test/functional/cmdLineTests/shareClassTests/SCCommandLineOptionTests/verboseOption.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # @test 1.0 diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests.xml b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests.xml index a063d4b531a..3b5de478d9e 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests_8.xml b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests_8.xml index df9073384e6..99b19b4527a 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests_8.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/HelperCompatibilityTests_8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest.java index 717595839b1..d6c3d110352 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest.java index 093b53c1365..3b172490a55 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; import java.io.File; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/TokenIncompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/TokenIncompatibilityTest.java index cc9ab80f95f..fd3b274afd0 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/TokenIncompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/TokenIncompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.net.URL; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperCompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperCompatibilityTest.java index 0557600deb3..f3950968b37 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperCompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperCompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.FileInputStream; import java.net.URL; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperStaleEntryCompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperStaleEntryCompatibilityTest.java index 80ce3eddaee..5e676e4bc42 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperStaleEntryCompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLClassPathHelperURLHelperStaleEntryCompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; import java.io.FileInputStream; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperCompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperCompatibilityTest.java index e49e1d3b96a..47e42ef6739 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperCompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperCompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.File; import java.io.FileInputStream; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperStaleEntryCompatibilityTest.java b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperStaleEntryCompatibilityTest.java index dde5c4786b9..f3798c24b8c 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperStaleEntryCompatibilityTest.java +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/URLHelperURLClassPathHelperStaleEntryCompatibilityTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; import java.io.File; diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/build.xml b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/build.xml index 6b25f6100d3..373c61e2c93 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/exclude.xml b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/exclude.xml index 387c877ac6f..781aa7feb93 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/exclude.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/playlist.xml index a5f60aa1709..1b56fb899cd 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCHelperCompatTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/ShareClassesSimpleSanity.xml b/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/ShareClassesSimpleSanity.xml index 5c06cc2d5f3..404dfe60bc6 100644 --- a/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/ShareClassesSimpleSanity.xml +++ b/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/ShareClassesSimpleSanity.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/build.xml b/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/build.xml index eb59925489b..cd740c70fd4 100644 --- a/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/playlist.xml b/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/playlist.xml index 1323870d3aa..757adab21ed 100644 --- a/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/ShareClassesSimpleSanity/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/StorageKey/build.xml b/test/functional/cmdLineTests/shareClassTests/StorageKey/build.xml index 60c393091d8..31434f1cef7 100644 --- a/test/functional/cmdLineTests/shareClassTests/StorageKey/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/StorageKey/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/StorageKey/playlist.xml b/test/functional/cmdLineTests/shareClassTests/StorageKey/playlist.xml index a8147f13563..43e5c3624c8 100644 --- a/test/functional/cmdLineTests/shareClassTests/StorageKey/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/StorageKey/playlist.xml @@ -14,7 +14,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/StorageKey/storageKey.xml b/test/functional/cmdLineTests/shareClassTests/StorageKey/storageKey.xml index ea90eca17df..67794b06d4a 100644 --- a/test/functional/cmdLineTests/shareClassTests/StorageKey/storageKey.xml +++ b/test/functional/cmdLineTests/shareClassTests/StorageKey/storageKey.xml @@ -15,7 +15,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTesterUtils.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTesterUtils.java index 0474429ac10..e10f2c65283 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTesterUtils.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTesterUtils.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_1.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_1.java index 74915cb0cf4..683cada81b8 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_1.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_2.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_2.java index 15a0681ee88..2a9260440e7 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_2.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_3.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_3.java index 4dd9f321b17..98144c740e5 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_3.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/FilterTester_3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/StoreFilter.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/StoreFilter.java index ceefc97172a..166accfd5b1 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/StoreFilter.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/APITests/StoreFilter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.bat b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.bat index f034badda02..dd680727411 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.bat +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.bat @@ -17,7 +17,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd Resources diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.sh b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.sh index 645383772f1..4d4349e30b7 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.sh +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/buildResources.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd Resources diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/A_Main.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/A_Main.java index 458d8011c15..6aa9cde402f 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/A_Main.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/A_Main.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package sharedclasses.storefilter.resources; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/B_Dummy.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/B_Dummy.java index d9d8f68c76d..da8b47336c9 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/B_Dummy.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/B_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package sharedclasses.storefilter.resources; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/C_Dummy.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/C_Dummy.java index 1350a217e8a..e39e59d924e 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/C_Dummy.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/C_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package sharedclasses.storefilter.resources; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/D_Dummy.java b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/D_Dummy.java index 6fcc4b2b6c2..80f620bbf1a 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/D_Dummy.java +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/Resources/sharedclasses/storefilter/resources/D_Dummy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package sharedclasses.storefilter.resources; diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests.xml b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests.xml index 8bf0d1f092e..bf0120aa758 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests_8.xml b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests_8.xml index a75f1089ba9..2c035fb40fb 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests_8.xml +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/StoreFilterTests_8.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/build.xml b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/build.xml index 261a4636fa6..6c3313486c1 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/playlist.xml index f680a55acdb..d8d750ffb70 100644 --- a/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/StoreFilterTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenGetDifferentHelperTest.java b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenGetDifferentHelperTest.java index 381689d2ba3..49977a1bacf 100644 --- a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenGetDifferentHelperTest.java +++ b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenGetDifferentHelperTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenMultipleGetHelperCallTest.java b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenMultipleGetHelperCallTest.java index 0bfc4f65363..c01fa514533 100644 --- a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenMultipleGetHelperCallTest.java +++ b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenMultipleGetHelperCallTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenStoreFindTest.java b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenStoreFindTest.java index 7c281fdef32..08bbf66b68c 100644 --- a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenStoreFindTest.java +++ b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/APITests/TokenStoreFindTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/StaleMarkingTests/StaleMarkingTest.java b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/StaleMarkingTests/StaleMarkingTest.java index 20dd88c9136..a9f5e770e8f 100644 --- a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/StaleMarkingTests/StaleMarkingTest.java +++ b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/StaleMarkingTests/StaleMarkingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package StaleMarkingTests; diff --git a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/TimeStampingTests/TimeStampingTest.java b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/TimeStampingTests/TimeStampingTest.java index dc27e1ce984..54c832903ee 100644 --- a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/TimeStampingTests/TimeStampingTest.java +++ b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/TimeStampingTests/TimeStampingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package TimeStampingTests; diff --git a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/build.xml b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/build.xml index 2d6b8de679d..f457c17d5a4 100644 --- a/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/TokenHelperTests/build.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullPointerAndEmptyArrayTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullPointerAndEmptyArrayTest.java index 9c912a2ffaf..2fa3853701c 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullPointerAndEmptyArrayTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullPointerAndEmptyArrayTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLFindTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLFindTest.java index 9fc8a332b6d..027005bf84b 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLFindTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLFindTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLStoreTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLStoreTest.java index 0b9bc5864d1..e297dc684df 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLStoreTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/NullURLStoreTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLGetDifferentHelperTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLGetDifferentHelperTest.java index de02781dc41..6e0525a1f39 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLGetDifferentHelperTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLGetDifferentHelperTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLMultipleGetHelperCallTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLMultipleGetHelperCallTest.java index 8e977d43ddc..f18b3240de5 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLMultipleGetHelperCallTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLMultipleGetHelperCallTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLStoreFindTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLStoreFindTest.java index 0ae41768372..f5e07a7d36d 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLStoreFindTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/APITests/URLStoreFindTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package APITests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/MultiLoadURLClassPathMatchingTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/MultiLoadURLClassPathMatchingTest.java index be79c8b82f3..b38b6240d12 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/MultiLoadURLClassPathMatchingTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/MultiLoadURLClassPathMatchingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package ClassPathMatchingTests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/URLClassPathMatchingTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/URLClassPathMatchingTest.java index dd45c88dc64..cbf6fcd1b1b 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/URLClassPathMatchingTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/ClassPathMatchingTests/URLClassPathMatchingTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package ClassPathMatchingTests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/PartitioningTests/URLPartitioningStoreFindTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/PartitioningTests/URLPartitioningStoreFindTest.java index d08b345ad95..99c751c4ba4 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/PartitioningTests/URLPartitioningStoreFindTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/PartitioningTests/URLPartitioningStoreFindTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package PartitioningTests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/StaleClassPathEntryTests/URLStaleClassPathEntryTest.java b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/StaleClassPathEntryTests/URLStaleClassPathEntryTest.java index 19012103e6e..627bd038433 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/StaleClassPathEntryTests/URLStaleClassPathEntryTest.java +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/StaleClassPathEntryTests/URLStaleClassPathEntryTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package StaleClassPathEntryTests; diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests.xml b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests.xml index 34585fb5693..a618da02e66 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests.xml +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests_80.xml b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests_80.xml index 9fa48737e21..b7f751de595 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests_80.xml +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/URLHelperTests_80.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/build.xml b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/build.xml index 1927a2f1420..eeca664138d 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/exclude.xml b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/exclude.xml index 69b733a015c..7f2ee6c13ca 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/exclude.xml +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/playlist.xml b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/playlist.xml index dd59aa9728e..6812ac2c2b0 100644 --- a/test/functional/cmdLineTests/shareClassTests/URLHelperTests/playlist.xml +++ b/test/functional/cmdLineTests/shareClassTests/URLHelperTests/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../../variables.mk diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.bat index 32ddaae36da..ccc315ca7ba 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd .\DuplicateOrphansTest diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.sh index 666911d6f06..43a6b716477 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/DifferentClassMultipleOrphanTest.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd ./DuplicateOrphansTest diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.bat index 4f70cc46975..80e4b74d247 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd .\EmptyDirectory diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.sh index f47ac50dc64..22487c93b2e 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest1.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd ./EmptyDirectory diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.bat index fc03977031a..ba1c22dfbe8 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem copy .\tempfiles\copiedJar.jar . diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.sh index d70b0146dc4..529c10004e4 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest2.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # /bin/cp ./tempfiles/copiedJar.jar . \ No newline at end of file diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.bat index 58beb96369a..003c29b7dd2 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem copy .\tempfiles\copiedJar2.jar . diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.sh index f431e52f08a..1b3b6cfe984 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/EmptyClassPathEntryTest3.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # /bin/cp ./tempfiles/copiedJar2.jar . \ No newline at end of file diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.bat index 8a0021c39ae..c0138589afe 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd .\AlphabetJar diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.sh index c739eab2131..11616ab43a6 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest1.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd ./AlphabetJar diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.bat index 97c803ea689..d2bbfe2ee7e 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd .\Alphabet diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.sh index f26ce3c974a..6028985ba20 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/MultiVMTest2.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd ./Alphabet diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.bat index 08f7dfb5397..d0da8fad255 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem cd .\EmptyDirectory diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.sh index edb699c7949..3edf001bcb9 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/PrepareForEmptyClassPathEntryTests.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cd ./EmptyDirectory diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.bat index 95996357cbe..62a99a49598 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.sh index 1c66052d35f..63968e798a3 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest1.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.bat index 596d9ab169c..5397a4a2cb3 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.sh index f27d0c5bf64..b1b2abad921 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest2.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.bat index 62b7608913d..28639b8150b 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.sh index b88a3c9e504..a2c6a48fdcb 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest3.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.bat index dbbef023639..932ef378c4f 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.sh index 760503c620a..84659d50223 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest4.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.bat index 2e3a10064fe..bca220b4101 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem rem Aim is to try and replace Alphabet.jar, sometimes this will fail if the classloader has it locked diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.sh index 89cbcfa6a1b..b4f6070d7d6 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleClassPathTest5.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.bat b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.bat index 7997bc31722..0219a86124a 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.bat +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.bat @@ -18,7 +18,7 @@ rem rem [1] https://www.gnu.org/software/classpath/license.html rem [2] https://openjdk.org/legal/assembly-exception.html rem -rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +rem SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 rem # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.sh b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.sh index 1c49a82c46b..c23587dac6e 100644 --- a/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.sh +++ b/test/functional/cmdLineTests/shareClassTests/batchfiles/StaleOrphanTest.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # ensure the new files are not created in the same second as the originals, diff --git a/test/functional/cmdLineTests/shareClassTests/build.xml b/test/functional/cmdLineTests/shareClassTests/build.xml index 3d4f550aa9c..9b0c36ffc6b 100644 --- a/test/functional/cmdLineTests/shareClassTests/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/A.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/A.java index 5bfd6d23501..d63acf6ed87 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/A.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/B.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/B.java index 396cece0a35..7f210733d59 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/B.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/C.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/C.java index 00cc62eb46a..ae609f4d19a 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/C.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/D.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/D.java index 81a6c6bf17f..607fcab8dbb 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/D.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/D.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/E.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/E.java index dd6d44b9bbf..cb3e0d3c685 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/E.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/E.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/F.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/F.java index cd3d8d84765..0f3c6eda13b 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/F.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/F.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/G.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/G.java index a378f5be70a..d7d2bd092b3 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/G.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/G.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/H.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/H.java index 1526b3e9cda..21f04033ddc 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/H.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Alphabet/H.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/B.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/B.java index 1c9a5cb0464..4c492b5e1ce 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/B.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/B.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/C.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/C.java index b25d22af1e3..1f302b6860d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/C.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/C.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/D.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/D.java index a7933a513d2..df5575fd6a8 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/D.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/D.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/E.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/E.java index e9e00031ff4..b3d15124b13 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/E.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/E.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/F.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/F.java index 695b35e17a6..f4e61cfe990 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/F.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/F.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/X.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/X.java index 70a72940779..837eefa4675 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/X.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AlphabetJar/X.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Alligator.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Alligator.java index 2bffc4b130e..2c005588160 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Alligator.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Alligator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Cat.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Cat.java index c953393bb7c..185f366e64d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Cat.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Cat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Dog.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Dog.java index 296f2021596..6696a643a49 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Dog.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Dog.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Elephant.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Elephant.java index 4a47caba0a3..01fb3adbe2d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Elephant.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Elephant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Fish.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Fish.java index 5bfe810ab29..679ee7ccbab 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Fish.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Fish.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Gerbil.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Gerbil.java index 8f66e8f4c4a..6cdf5d3aa4f 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Gerbil.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Gerbil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Hamster.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Hamster.java index fdda7b2a06b..6b14893a8fc 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Hamster.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Hamster.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Lion.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Lion.java index 8008cc93ba2..b7686dad78d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Lion.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Lion.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Rhino.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Rhino.java index b510bc03618..dae2ef2e822 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Rhino.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Rhino.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Tiger.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Tiger.java index 97569a64b78..677fec25782 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Tiger.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Animals/Tiger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Alligator.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Alligator.java index df6327daedf..94c5f6fd436 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Alligator.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Alligator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Elephant.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Elephant.java index 9bdf9a4e8c2..fcd77556d7a 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Elephant.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Elephant.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Lion.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Lion.java index a1c59be429a..9283f66ca75 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Lion.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Lion.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Rhino.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Rhino.java index af4f685811e..05f4c9b5a8c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Rhino.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Rhino.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Tiger.java b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Tiger.java index bf62a82c732..3b06ab680b8 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Tiger.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/AnimalsJar/Tiger.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Cricket.java b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Cricket.java index db510a0f2ca..0a4a6700968 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Cricket.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Cricket.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Football.java b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Football.java index 50ef33a6a52..f20fe66814d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Football.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Football.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Golf.java b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Golf.java index db6f13b5501..6a37ded1693 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Golf.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Golf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Rugby.java b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Rugby.java index c0e5afb93ab..15758a92899 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Rugby.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Rugby.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Tennis.java b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Tennis.java index 77ce4bd4915..8867d59a51d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Tennis.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/BallSports/Tennis.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/DuplicateOrphan.java b/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/DuplicateOrphan.java index e4df9211d5f..66c9c9f2126 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/DuplicateOrphan.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/DuplicateOrphan.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/temp/DuplicateOrphan.java b/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/temp/DuplicateOrphan.java index d122bc8575e..dfe61c13736 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/temp/DuplicateOrphan.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/DuplicateOrphansTest/temp/DuplicateOrphan.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Burgers.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Burgers.java index e4d87aeffbb..a6f6e9492d8 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Burgers.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Burgers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/CheeseCake.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/CheeseCake.java index ecbb617808f..6641857db64 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/CheeseCake.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/CheeseCake.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/ChocolateCake.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/ChocolateCake.java index 297efa97232..a1a0cec296d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/ChocolateCake.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/ChocolateCake.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Curry.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Curry.java index 25e672085b9..28367835cba 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Curry.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Curry.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/IceCream.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/IceCream.java index c20a9e7ba3a..75e255d981c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/IceCream.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/IceCream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Noodles.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Noodles.java index 77e5798ddfa..4aa21a3f705 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Noodles.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Noodles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pasta.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pasta.java index 787af80118e..2e1694fa010 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pasta.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pasta.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pizza.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pizza.java index c450fe0012b..0990afbb504 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pizza.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Pizza.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Sorbet.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Sorbet.java index 0a4d1b409ee..5ec75d76c4c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Sorbet.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Sorbet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Vegetables.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Vegetables.java index b4b347931f0..72a4042ea9d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Vegetables.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Food/Vegetables.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Burgers.java b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Burgers.java index ec01199937d..9122b566e59 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Burgers.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Burgers.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/ChocolateCake.java b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/ChocolateCake.java index 3ea8205f646..cf68746f811 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/ChocolateCake.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/ChocolateCake.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/IceCream.java b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/IceCream.java index 6bbe22c8412..035914bc3f4 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/IceCream.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/IceCream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Noodles.java b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Noodles.java index 8dcaf4d4f1c..4594bef0058 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Noodles.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Noodles.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Pizza.java b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Pizza.java index b7166bb64f0..e8abab0664d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Pizza.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Pizza.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Sorbet.java b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Sorbet.java index 486262eec04..392004e2589 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Sorbet.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/FoodJar/Sorbet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Cat.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Cat.java index 186131da0ce..9611905260c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Cat.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Cat.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Dog.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Dog.java index 634fd452107..179ffaa6da4 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Dog.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Dog.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Fish.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Fish.java index b574a15d10c..62cc6fdd07e 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Fish.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Fish.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Gerbil.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Gerbil.java index ca2e7b9ce0e..a93d7dacb02 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Gerbil.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Gerbil.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Hamster.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Hamster.java index 6894f1f467b..9ea0f24866c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Hamster.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pets/Hamster.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/CheeseCake.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/CheeseCake.java index 360c880da3a..30027f3c1de 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/CheeseCake.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/CheeseCake.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/ChocolateCake.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/ChocolateCake.java index 66ec4aebefe..8f43a334db9 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/ChocolateCake.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/ChocolateCake.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/IceCream.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/IceCream.java index 6897ccd0595..07d0c13bf28 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/IceCream.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/IceCream.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/Sorbet.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/Sorbet.java index ff3bacf237d..d3f0cef7662 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/Sorbet.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Pudding/Sorbet.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Athletics.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Athletics.java index 86e754f8dd9..3dc6d310d55 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Athletics.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Athletics.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Cricket.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Cricket.java index 4902071b559..e31d478a864 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Cricket.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Cricket.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Darts.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Darts.java index a3603c0d639..278c928762b 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Darts.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Darts.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Football.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Football.java index 267922dc6d2..21ef07511c6 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Football.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Football.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Golf.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Golf.java index 754ec3092ad..978cb15e648 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Golf.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Golf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Gymnastics.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Gymnastics.java index f77698fcc2d..e4565652f03 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Gymnastics.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Gymnastics.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/MotorRacing.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/MotorRacing.java index 8affadd75e8..0a4becacc5a 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/MotorRacing.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/MotorRacing.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Rugby.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Rugby.java index 18679700934..2cd97df26a6 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Rugby.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Rugby.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/SpeedSkating.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/SpeedSkating.java index 13586b92828..f174fd38d6b 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/SpeedSkating.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/SpeedSkating.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Tennis.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Tennis.java index e344f487123..b26631897de 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Tennis.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Sports/Tennis.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Athletics.java b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Athletics.java index 452a32c6c36..3ba2b51b487 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Athletics.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Athletics.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Football.java b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Football.java index e15ed8a3a7e..bbb6911d036 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Football.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Football.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Golf.java b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Golf.java index dc3c3874bfe..a438c84348d 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Golf.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Golf.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/MotorRacing.java b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/MotorRacing.java index 27d424598ce..c21ad9e3039 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/MotorRacing.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/MotorRacing.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Rugby.java b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Rugby.java index 643a78396c8..d1beece1fb3 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Rugby.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Rugby.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Tennis.java b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Tennis.java index 07afe72ba4f..c1a864e7e8c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Tennis.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/SportsJar/Tennis.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan.java index 302744975e5..add440c7fa5 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan1.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan1.java index 138fa3c4644..e06e95629a1 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan1.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan2.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan2.java index 75aae618327..63ffd13fbfe 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan2.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan3.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan3.java index fc0bb25072b..e75b0a66a82 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan3.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan4.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan4.java index ccb11f69d8f..e0c1fdeb0ae 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan4.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan5.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan5.java index cafc2567f9b..d536475b6a5 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan5.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan6.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan6.java index 92d4ee89e00..eb75b80afe4 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan6.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan7.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan7.java index 287276fc08c..0a38eed0375 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan7.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan8.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan8.java index aaa7145ed65..eab1f285e05 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan8.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan9.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan9.java index b480e976917..1bf7556dcc8 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan9.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/StaleOrphan9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan.java index f1469232484..ba868ef7d6e 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan1.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan1.java index 6a18c34536f..e580b9c87da 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan1.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan2.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan2.java index 939dcb26244..a90f8017c16 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan2.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan3.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan3.java index ca34f2e6e3d..df0748eb2c8 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan3.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan4.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan4.java index fb66acd54ea..e31a82c714c 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan4.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan5.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan5.java index d00e3e3fbe4..27a4bccd3fd 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan5.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan6.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan6.java index 23ed9d13fb3..20521281932 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan6.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan7.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan7.java index 94e75ee0a96..7f119173b68 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan7.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan8.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan8.java index 4291e66aa73..f5410d092d9 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan8.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan9.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan9.java index fa9eefe6650..2fa69f9ed97 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan9.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest/temp/StaleOrphan9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest1/StaleOrphan.java b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest1/StaleOrphan.java index cd83588a926..57e8add0912 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest1/StaleOrphan.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/StaleOrphansTest1/StaleOrphan.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import Utilities.TestClass; diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/A.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/A.java index 6f44a1b8d41..7b058bd2413 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/A.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/A.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/E.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/E.java index 5384536c05e..084345686d2 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/E.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/E.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/I.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/I.java index 7631a4a0217..40920653452 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/I.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/I.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/O.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/O.java index 3962d491a0d..6cc53c92182 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/O.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/O.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/U.java b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/U.java index 51f8b1c5c26..315140b2212 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/U.java +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/Vowels/U.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdLineTests/shareClassTests/testClasses/build.xml b/test/functional/cmdLineTests/shareClassTests/testClasses/build.xml index 4e7c8b71e4a..4dd6d3ad347 100644 --- a/test/functional/cmdLineTests/shareClassTests/testClasses/build.xml +++ b/test/functional/cmdLineTests/shareClassTests/testClasses/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/ClassLoaderType.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/ClassLoaderType.java index 9f1913f3a52..44dcb49ca0c 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/ClassLoaderType.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/ClassLoaderType.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomLoaderMetaDataCache.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomLoaderMetaDataCache.java index 0ca7faa8237..9ebeb06acfa 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomLoaderMetaDataCache.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomLoaderMetaDataCache.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLCL.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLCL.java index ca5b0c31a54..e7669e56777 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLCL.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLCL.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLLoader.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLLoader.java index 6605cda6373..75cadd487b5 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLLoader.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomPartitioningURLLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomTokenClassLoader.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomTokenClassLoader.java index 212d7616fc1..077daa82aaf 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomTokenClassLoader.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomTokenClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoader.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoader.java index 2f8dab56360..a350fa0b8e7 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoader.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNoAPIUse.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNoAPIUse.java index 08d8ef7acd6..d12eccaebe2 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNoAPIUse.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNoAPIUse.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNonConfirming.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNonConfirming.java index 905fb9b46b4..9982b75e9e8 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNonConfirming.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLClassLoaderNonConfirming.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLLoader.java b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLLoader.java index 7db44caf4d8..8008bd063af 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLLoader.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/CustomCLs/CustomURLLoader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package CustomCLs; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Loader.java b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Loader.java index 0d3f358b8d8..77b37417a57 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Loader.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Loader.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package Utilities; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/RunCommand.java b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/RunCommand.java index af7c42adcec..d6d22fad17b 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/RunCommand.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/RunCommand.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package Utilities; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/StringManipulator.java b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/StringManipulator.java index 962c4800c7d..7c91cb3d852 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/StringManipulator.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/StringManipulator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package Utilities; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/TestClass.java b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/TestClass.java index 7aa63b132e0..c19e7573a68 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/TestClass.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/TestClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package Utilities; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/URLClassPathCreator.java b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/URLClassPathCreator.java index 2dc624df7cc..fd1d4494f6b 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/URLClassPathCreator.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/URLClassPathCreator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package Utilities; diff --git a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Verifier.java b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Verifier.java index 2923da988c2..4674e1a324d 100644 --- a/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Verifier.java +++ b/test/functional/cmdLineTests/shareClassTests/utils/src/Utilities/Verifier.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package Utilities; diff --git a/test/functional/cmdLineTests/shrcdbgddrext/build.xml b/test/functional/cmdLineTests/shrcdbgddrext/build.xml index 5db40b3451b..2e908637512 100644 --- a/test/functional/cmdLineTests/shrcdbgddrext/build.xml +++ b/test/functional/cmdLineTests/shrcdbgddrext/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/shrcdbgddrext/concatenate_dumps.sh b/test/functional/cmdLineTests/shrcdbgddrext/concatenate_dumps.sh index 886524942d9..157ae83af54 100644 --- a/test/functional/cmdLineTests/shrcdbgddrext/concatenate_dumps.sh +++ b/test/functional/cmdLineTests/shrcdbgddrext/concatenate_dumps.sh @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # cat $1 $2 > $3 diff --git a/test/functional/cmdLineTests/shrcdbgddrext/playlist.xml b/test/functional/cmdLineTests/shrcdbgddrext/playlist.xml index 3ed5775e427..c9fc36ed2a2 100644 --- a/test/functional/cmdLineTests/shrcdbgddrext/playlist.xml +++ b/test/functional/cmdLineTests/shrcdbgddrext/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/shrcdbgddrext/shrcdbgextddrtests.xml b/test/functional/cmdLineTests/shrcdbgddrext/shrcdbgextddrtests.xml index 11b8897d94a..71370c0a152 100644 --- a/test/functional/cmdLineTests/shrcdbgddrext/shrcdbgextddrtests.xml +++ b/test/functional/cmdLineTests/shrcdbgddrext/shrcdbgextddrtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/sigabrtHandlingTest/build.xml b/test/functional/cmdLineTests/sigabrtHandlingTest/build.xml index df03701d76d..8a3ea833b28 100644 --- a/test/functional/cmdLineTests/sigabrtHandlingTest/build.xml +++ b/test/functional/cmdLineTests/sigabrtHandlingTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/sigabrtHandlingTest/playlist.xml b/test/functional/cmdLineTests/sigabrtHandlingTest/playlist.xml index edd553d65c7..f8307ee948c 100644 --- a/test/functional/cmdLineTests/sigabrtHandlingTest/playlist.xml +++ b/test/functional/cmdLineTests/sigabrtHandlingTest/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/sigabrtHandlingTest/sigabrtHandlingTest.xml b/test/functional/cmdLineTests/sigabrtHandlingTest/sigabrtHandlingTest.xml index d3d59afce79..766b8d37b0a 100644 --- a/test/functional/cmdLineTests/sigabrtHandlingTest/sigabrtHandlingTest.xml +++ b/test/functional/cmdLineTests/sigabrtHandlingTest/sigabrtHandlingTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/sigxfszHandlingTest/build.xml b/test/functional/cmdLineTests/sigxfszHandlingTest/build.xml index cd1aa0dbd1b..fc5d0d70c26 100644 --- a/test/functional/cmdLineTests/sigxfszHandlingTest/build.xml +++ b/test/functional/cmdLineTests/sigxfszHandlingTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/sigxfszHandlingTest/playlist.xml b/test/functional/cmdLineTests/sigxfszHandlingTest/playlist.xml index 764d0f56b11..faa147e5ec6 100644 --- a/test/functional/cmdLineTests/sigxfszHandlingTest/playlist.xml +++ b/test/functional/cmdLineTests/sigxfszHandlingTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/sigxfszHandlingTest/runSIGXFSZTest.sh b/test/functional/cmdLineTests/sigxfszHandlingTest/runSIGXFSZTest.sh index 89d19f4cb75..a1454d2761e 100644 --- a/test/functional/cmdLineTests/sigxfszHandlingTest/runSIGXFSZTest.sh +++ b/test/functional/cmdLineTests/sigxfszHandlingTest/runSIGXFSZTest.sh @@ -19,7 +19,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 # # Get the test command diff --git a/test/functional/cmdLineTests/sigxfszHandlingTest/sigxfszHandlingTest.xml b/test/functional/cmdLineTests/sigxfszHandlingTest/sigxfszHandlingTest.xml index 338613db6bc..1fefd586473 100644 --- a/test/functional/cmdLineTests/sigxfszHandlingTest/sigxfszHandlingTest.xml +++ b/test/functional/cmdLineTests/sigxfszHandlingTest/sigxfszHandlingTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/softmxCmdOptTest/build.xml b/test/functional/cmdLineTests/softmxCmdOptTest/build.xml index 1f5d2f2e4a0..6f1fb63b405 100644 --- a/test/functional/cmdLineTests/softmxCmdOptTest/build.xml +++ b/test/functional/cmdLineTests/softmxCmdOptTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/softmxCmdOptTest/playlist.xml b/test/functional/cmdLineTests/softmxCmdOptTest/playlist.xml index 9166facc3bd..fa6b5fc42d4 100644 --- a/test/functional/cmdLineTests/softmxCmdOptTest/playlist.xml +++ b/test/functional/cmdLineTests/softmxCmdOptTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/softmxCmdOptTest/softmx.xml b/test/functional/cmdLineTests/softmxCmdOptTest/softmx.xml index 7fe7d10668f..fa6b178ebda 100644 --- a/test/functional/cmdLineTests/softmxCmdOptTest/softmx.xml +++ b/test/functional/cmdLineTests/softmxCmdOptTest/softmx.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/stackSizeInfoTest/StackSizeInfoTest.xml b/test/functional/cmdLineTests/stackSizeInfoTest/StackSizeInfoTest.xml index c3418750d16..59316348e8a 100644 --- a/test/functional/cmdLineTests/stackSizeInfoTest/StackSizeInfoTest.xml +++ b/test/functional/cmdLineTests/stackSizeInfoTest/StackSizeInfoTest.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/stackSizeInfoTest/build.xml b/test/functional/cmdLineTests/stackSizeInfoTest/build.xml index 5cd022e2fec..11c8a3c8fb2 100644 --- a/test/functional/cmdLineTests/stackSizeInfoTest/build.xml +++ b/test/functional/cmdLineTests/stackSizeInfoTest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/stackSizeInfoTest/playlist.xml b/test/functional/cmdLineTests/stackSizeInfoTest/playlist.xml index 089e66d0fc1..5782c05e824 100644 --- a/test/functional/cmdLineTests/stackSizeInfoTest/playlist.xml +++ b/test/functional/cmdLineTests/stackSizeInfoTest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/utils/build.xml b/test/functional/cmdLineTests/utils/build.xml index 046a1324841..93bafe46c39 100644 --- a/test/functional/cmdLineTests/utils/build.xml +++ b/test/functional/cmdLineTests/utils/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/utils/src/VMBench/FibBench.java b/test/functional/cmdLineTests/utils/src/VMBench/FibBench.java index 7734ee94a2c..7aac0651570 100644 --- a/test/functional/cmdLineTests/utils/src/VMBench/FibBench.java +++ b/test/functional/cmdLineTests/utils/src/VMBench/FibBench.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package VMBench; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java index c55e39673f9..be8655dbf5b 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classtests; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/ClassTest.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/ClassTest.java index 9c69e8dd86d..90f4a0f4d30 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/ClassTest.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/ClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classtests; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/UnsafeBootClass.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/UnsafeBootClass.java index ce83215deb0..1ed387de318 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/UnsafeBootClass.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/classtests/UnsafeBootClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classtests; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Disk.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Disk.java index 89f5f354e0c..0708a030eb6 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Disk.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Disk.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Hanoi.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Hanoi.java index e0e914d53b9..0b25eeeebd9 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Hanoi.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Hanoi.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Post.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Post.java index 34b9d63d083..e0abf694639 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Post.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/ivj/Post.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.ivj; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test1.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test1.java index 44e55f7ad2a..ba0651b8081 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test1.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lambdatests; diff --git a/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test2.java b/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test2.java index 1074e044ba1..2db3c858d22 100644 --- a/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test2.java +++ b/test/functional/cmdLineTests/utils/src/org/openj9/test/lambdatests/Test2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.lambdatests; diff --git a/test/functional/cmdLineTests/utils/src_shared/org/openj9/test/classtests/ClassTestHelper.java b/test/functional/cmdLineTests/utils/src_shared/org/openj9/test/classtests/ClassTestHelper.java index e9ed45d8b3a..75a0facbc17 100644 --- a/test/functional/cmdLineTests/utils/src_shared/org/openj9/test/classtests/ClassTestHelper.java +++ b/test/functional/cmdLineTests/utils/src_shared/org/openj9/test/classtests/ClassTestHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classtests; diff --git a/test/functional/cmdLineTests/utils2/build.xml b/test/functional/cmdLineTests/utils2/build.xml index f0310179e88..81519786450 100644 --- a/test/functional/cmdLineTests/utils2/build.xml +++ b/test/functional/cmdLineTests/utils2/build.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java b/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java index 8d6c2c11f9a..03eaf2c8f6f 100644 --- a/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java +++ b/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/AnonClassAndUnsafeClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classtests; diff --git a/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/ClassTest.java b/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/ClassTest.java index 9d2f42407b4..ebe1185c3f2 100644 --- a/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/ClassTest.java +++ b/test/functional/cmdLineTests/utils2/src/org/openj9/test/classtests/ClassTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package org.openj9.test.classtests; diff --git a/test/functional/cmdLineTests/valuetypeddrtests/build.xml b/test/functional/cmdLineTests/valuetypeddrtests/build.xml index bd528c4e6a6..6e98aa143cc 100644 --- a/test/functional/cmdLineTests/valuetypeddrtests/build.xml +++ b/test/functional/cmdLineTests/valuetypeddrtests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/valuetypeddrtests/flattened32bitRefBackfillTest.xml b/test/functional/cmdLineTests/valuetypeddrtests/flattened32bitRefBackfillTest.xml index f8391aaf5f3..38e15333989 100644 --- a/test/functional/cmdLineTests/valuetypeddrtests/flattened32bitRefBackfillTest.xml +++ b/test/functional/cmdLineTests/valuetypeddrtests/flattened32bitRefBackfillTest.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/valuetypeddrtests/flattenedvaluetypeddrtests.xml b/test/functional/cmdLineTests/valuetypeddrtests/flattenedvaluetypeddrtests.xml index 9cf50faa225..7606b973504 100644 --- a/test/functional/cmdLineTests/valuetypeddrtests/flattenedvaluetypeddrtests.xml +++ b/test/functional/cmdLineTests/valuetypeddrtests/flattenedvaluetypeddrtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/valuetypeddrtests/playlist.xml b/test/functional/cmdLineTests/valuetypeddrtests/playlist.xml index 3e6a6b53e6c..2e6c9dabd81 100644 --- a/test/functional/cmdLineTests/valuetypeddrtests/playlist.xml +++ b/test/functional/cmdLineTests/valuetypeddrtests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/valuetypeddrtests/unflattenedvaluetypeddrtests.xml b/test/functional/cmdLineTests/valuetypeddrtests/unflattenedvaluetypeddrtests.xml index 7630860111a..9f09e6e8a67 100644 --- a/test/functional/cmdLineTests/valuetypeddrtests/unflattenedvaluetypeddrtests.xml +++ b/test/functional/cmdLineTests/valuetypeddrtests/unflattenedvaluetypeddrtests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/variables.mk b/test/functional/cmdLineTests/variables.mk index f52ab7beec9..6ebd8205b79 100644 --- a/test/functional/cmdLineTests/variables.mk +++ b/test/functional/cmdLineTests/variables.mk @@ -17,7 +17,7 @@ # [1] https://www.gnu.org/software/classpath/license.html # [2] https://openjdk.org/legal/assembly-exception.html # -# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 ############################################################################## # if JDK_IMPL is openj9 or ibm diff --git a/test/functional/cmdLineTests/verboseVerification/VerboseVerification.xml b/test/functional/cmdLineTests/verboseVerification/VerboseVerification.xml index f99923514f1..a1b896400e0 100644 --- a/test/functional/cmdLineTests/verboseVerification/VerboseVerification.xml +++ b/test/functional/cmdLineTests/verboseVerification/VerboseVerification.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/verboseVerification/build.xml b/test/functional/cmdLineTests/verboseVerification/build.xml index c64816d3f0d..59048b402f8 100644 --- a/test/functional/cmdLineTests/verboseVerification/build.xml +++ b/test/functional/cmdLineTests/verboseVerification/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/verboseVerification/cmdlineopttest_exclude.xml b/test/functional/cmdLineTests/verboseVerification/cmdlineopttest_exclude.xml index 9aa939ccb6d..89c1819176e 100644 --- a/test/functional/cmdLineTests/verboseVerification/cmdlineopttest_exclude.xml +++ b/test/functional/cmdLineTests/verboseVerification/cmdlineopttest_exclude.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/verboseVerification/playlist.xml b/test/functional/cmdLineTests/verboseVerification/playlist.xml index 18be29098a6..557fa830ddb 100644 --- a/test/functional/cmdLineTests/verboseVerification/playlist.xml +++ b/test/functional/cmdLineTests/verboseVerification/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/verbosetest/build.xml b/test/functional/cmdLineTests/verbosetest/build.xml index 5099906610e..be744b146e8 100644 --- a/test/functional/cmdLineTests/verbosetest/build.xml +++ b/test/functional/cmdLineTests/verbosetest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/verbosetest/playlist.xml b/test/functional/cmdLineTests/verbosetest/playlist.xml index 98105669e0b..812da336e79 100644 --- a/test/functional/cmdLineTests/verbosetest/playlist.xml +++ b/test/functional/cmdLineTests/verbosetest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/verbosetest/verbosetests.xml b/test/functional/cmdLineTests/verbosetest/verbosetests.xml index f8f4705359e..68e8bc0c02c 100644 --- a/test/functional/cmdLineTests/verbosetest/verbosetests.xml +++ b/test/functional/cmdLineTests/verbosetest/verbosetests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/verbosetest/verbosetests_11.xml b/test/functional/cmdLineTests/verbosetest/verbosetests_11.xml index 6e31e76a61b..40dc1607772 100644 --- a/test/functional/cmdLineTests/verbosetest/verbosetests_11.xml +++ b/test/functional/cmdLineTests/verbosetest/verbosetests_11.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/vmRuntimeState/build.xml b/test/functional/cmdLineTests/vmRuntimeState/build.xml index 8aad01773f9..bb4018f9d56 100644 --- a/test/functional/cmdLineTests/vmRuntimeState/build.xml +++ b/test/functional/cmdLineTests/vmRuntimeState/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/vmRuntimeState/playlist.xml b/test/functional/cmdLineTests/vmRuntimeState/playlist.xml index 9e2b0f22491..82408cfd05b 100644 --- a/test/functional/cmdLineTests/vmRuntimeState/playlist.xml +++ b/test/functional/cmdLineTests/vmRuntimeState/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/vmRuntimeState/src/ActiveIdleTest.java b/test/functional/cmdLineTests/vmRuntimeState/src/ActiveIdleTest.java index c4d8832b329..7fc7a1887c7 100644 --- a/test/functional/cmdLineTests/vmRuntimeState/src/ActiveIdleTest.java +++ b/test/functional/cmdLineTests/vmRuntimeState/src/ActiveIdleTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.*; diff --git a/test/functional/cmdLineTests/vmRuntimeState/vmruntimestate.xml b/test/functional/cmdLineTests/vmRuntimeState/vmruntimestate.xml index b4889ee5381..9944cf2921e 100644 --- a/test/functional/cmdLineTests/vmRuntimeState/vmruntimestate.xml +++ b/test/functional/cmdLineTests/vmRuntimeState/vmruntimestate.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xcheckjni/build.xml b/test/functional/cmdLineTests/xcheckjni/build.xml index ee6e851f379..affee73a347 100644 --- a/test/functional/cmdLineTests/xcheckjni/build.xml +++ b/test/functional/cmdLineTests/xcheckjni/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xcheckjni/playlist.xml b/test/functional/cmdLineTests/xcheckjni/playlist.xml index 93e4c26443d..8b3ace07183 100644 --- a/test/functional/cmdLineTests/xcheckjni/playlist.xml +++ b/test/functional/cmdLineTests/xcheckjni/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/xcheckjni/xcheckjni.xml b/test/functional/cmdLineTests/xcheckjni/xcheckjni.xml index 374481dc15d..7cf89768d8c 100644 --- a/test/functional/cmdLineTests/xcheckjni/xcheckjni.xml +++ b/test/functional/cmdLineTests/xcheckjni/xcheckjni.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xlogTests/build.xml b/test/functional/cmdLineTests/xlogTests/build.xml index 74037e76577..05266c9f95f 100644 --- a/test/functional/cmdLineTests/xlogTests/build.xml +++ b/test/functional/cmdLineTests/xlogTests/build.xml @@ -19,7 +19,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xlogTests/playlist.xml b/test/functional/cmdLineTests/xlogTests/playlist.xml index 69d50cf1112..b9a7bb868a0 100644 --- a/test/functional/cmdLineTests/xlogTests/playlist.xml +++ b/test/functional/cmdLineTests/xlogTests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/xlogTests/xlog.xml b/test/functional/cmdLineTests/xlogTests/xlog.xml index 122750430b7..864f4830cfe 100644 --- a/test/functional/cmdLineTests/xlogTests/xlog.xml +++ b/test/functional/cmdLineTests/xlogTests/xlog.xml @@ -19,7 +19,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xlpCMLTests/build.xml b/test/functional/cmdLineTests/xlpCMLTests/build.xml index 7210073b833..db75b6d5efe 100644 --- a/test/functional/cmdLineTests/xlpCMLTests/build.xml +++ b/test/functional/cmdLineTests/xlpCMLTests/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xlpCMLTests/playlist.xml b/test/functional/cmdLineTests/xlpCMLTests/playlist.xml index b15fda4ab2e..774b9e04731 100644 --- a/test/functional/cmdLineTests/xlpCMLTests/playlist.xml +++ b/test/functional/cmdLineTests/xlpCMLTests/playlist.xml @@ -18,7 +18,7 @@ OpenJDK Assembly Exception [2]. [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html -SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception +SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdLineTests/xlpCMLTests/xlpCMLTests.xml b/test/functional/cmdLineTests/xlpCMLTests/xlpCMLTests.xml index 75698a1dd6e..2658490dcab 100644 --- a/test/functional/cmdLineTests/xlpCMLTests/xlpCMLTests.xml +++ b/test/functional/cmdLineTests/xlpCMLTests/xlpCMLTests.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xxargtest/XXArgumentTesting.xml b/test/functional/cmdLineTests/xxargtest/XXArgumentTesting.xml index bebcba74860..ce5b019b3ff 100644 --- a/test/functional/cmdLineTests/xxargtest/XXArgumentTesting.xml +++ b/test/functional/cmdLineTests/xxargtest/XXArgumentTesting.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xxargtest/XXArgumentTesting_j9.xml b/test/functional/cmdLineTests/xxargtest/XXArgumentTesting_j9.xml index da60a4c4301..9bbbbf0e8a1 100644 --- a/test/functional/cmdLineTests/xxargtest/XXArgumentTesting_j9.xml +++ b/test/functional/cmdLineTests/xxargtest/XXArgumentTesting_j9.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xxargtest/build.xml b/test/functional/cmdLineTests/xxargtest/build.xml index 29c0a760d54..4ca984f2aed 100644 --- a/test/functional/cmdLineTests/xxargtest/build.xml +++ b/test/functional/cmdLineTests/xxargtest/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdLineTests/xxargtest/playlist.xml b/test/functional/cmdLineTests/xxargtest/playlist.xml index 54bb4186d90..33a4491e52a 100644 --- a/test/functional/cmdLineTests/xxargtest/playlist.xml +++ b/test/functional/cmdLineTests/xxargtest/playlist.xml @@ -18,7 +18,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> ../variables.mk diff --git a/test/functional/cmdline_options_tester/build.xml b/test/functional/cmdline_options_tester/build.xml index ae0efbf31e2..748ac45636d 100644 --- a/test/functional/cmdline_options_tester/build.xml +++ b/test/functional/cmdline_options_tester/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdline_options_tester/src/Command.java b/test/functional/cmdline_options_tester/src/Command.java index b4d971e0817..f10e1fe0020 100644 --- a/test/functional/cmdline_options_tester/src/Command.java +++ b/test/functional/cmdline_options_tester/src/Command.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ interface Command { diff --git a/test/functional/cmdline_options_tester/src/CommandExecuter.java b/test/functional/cmdline_options_tester/src/CommandExecuter.java index 639f75c6411..a97b3707aa5 100644 --- a/test/functional/cmdline_options_tester/src/CommandExecuter.java +++ b/test/functional/cmdline_options_tester/src/CommandExecuter.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.*; diff --git a/test/functional/cmdline_options_tester/src/Delay.java b/test/functional/cmdline_options_tester/src/Delay.java index b1daef721d5..2cdd1a6780e 100644 --- a/test/functional/cmdline_options_tester/src/Delay.java +++ b/test/functional/cmdline_options_tester/src/Delay.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Delay implements Command { diff --git a/test/functional/cmdline_options_tester/src/Echo.java b/test/functional/cmdline_options_tester/src/Echo.java index 0b49723049d..56f8d65a15b 100644 --- a/test/functional/cmdline_options_tester/src/Echo.java +++ b/test/functional/cmdline_options_tester/src/Echo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Echo implements Command { diff --git a/test/functional/cmdline_options_tester/src/EnvVar.java b/test/functional/cmdline_options_tester/src/EnvVar.java index 5fcade0b7b0..25741363fab 100644 --- a/test/functional/cmdline_options_tester/src/EnvVar.java +++ b/test/functional/cmdline_options_tester/src/EnvVar.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ diff --git a/test/functional/cmdline_options_tester/src/IfTest.java b/test/functional/cmdline_options_tester/src/IfTest.java index 2d555109dcf..4199e5e96fd 100644 --- a/test/functional/cmdline_options_tester/src/IfTest.java +++ b/test/functional/cmdline_options_tester/src/IfTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ class IfTest implements Command { diff --git a/test/functional/cmdline_options_tester/src/MainTester.java b/test/functional/cmdline_options_tester/src/MainTester.java index 9ecf16a6b1f..29c2b4aa0fd 100644 --- a/test/functional/cmdline_options_tester/src/MainTester.java +++ b/test/functional/cmdline_options_tester/src/MainTester.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import com.oti.j9.exclude.ExcludeList; diff --git a/test/functional/cmdline_options_tester/src/Output.java b/test/functional/cmdline_options_tester/src/Output.java index e9392e59484..77122751a26 100644 --- a/test/functional/cmdline_options_tester/src/Output.java +++ b/test/functional/cmdline_options_tester/src/Output.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.regex.Matcher; diff --git a/test/functional/cmdline_options_tester/src/OutputRegexHelper.java b/test/functional/cmdline_options_tester/src/OutputRegexHelper.java index f02c7619c17..78bd5feefd8 100644 --- a/test/functional/cmdline_options_tester/src/OutputRegexHelper.java +++ b/test/functional/cmdline_options_tester/src/OutputRegexHelper.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.regex.Matcher; diff --git a/test/functional/cmdline_options_tester/src/ReturnValue.java b/test/functional/cmdline_options_tester/src/ReturnValue.java index f37600aba06..9e2699cc9d0 100644 --- a/test/functional/cmdline_options_tester/src/ReturnValue.java +++ b/test/functional/cmdline_options_tester/src/ReturnValue.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ class ReturnValue extends TestCondition { diff --git a/test/functional/cmdline_options_tester/src/SaveOutput.java b/test/functional/cmdline_options_tester/src/SaveOutput.java index 7a3a305e20f..6b8cee22fcd 100644 --- a/test/functional/cmdline_options_tester/src/SaveOutput.java +++ b/test/functional/cmdline_options_tester/src/SaveOutput.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdline_options_tester/src/Stopwatch.java b/test/functional/cmdline_options_tester/src/Stopwatch.java index b0ebd3a9c5b..89707955369 100644 --- a/test/functional/cmdline_options_tester/src/Stopwatch.java +++ b/test/functional/cmdline_options_tester/src/Stopwatch.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.*; diff --git a/test/functional/cmdline_options_tester/src/Test.java b/test/functional/cmdline_options_tester/src/Test.java index a0939e80a13..1ab5e62e6f2 100644 --- a/test/functional/cmdline_options_tester/src/Test.java +++ b/test/functional/cmdline_options_tester/src/Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.BufferedReader; diff --git a/test/functional/cmdline_options_tester/src/TestCondition.java b/test/functional/cmdline_options_tester/src/TestCondition.java index 664a3cb561a..a4d2501d1e3 100644 --- a/test/functional/cmdline_options_tester/src/TestCondition.java +++ b/test/functional/cmdline_options_tester/src/TestCondition.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ abstract class TestCondition { diff --git a/test/functional/cmdline_options_tester/src/TestConfigParser.java b/test/functional/cmdline_options_tester/src/TestConfigParser.java index 67f69348aa3..0c268310fe8 100644 --- a/test/functional/cmdline_options_tester/src/TestConfigParser.java +++ b/test/functional/cmdline_options_tester/src/TestConfigParser.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.*; diff --git a/test/functional/cmdline_options_tester/src/TestIterator.java b/test/functional/cmdline_options_tester/src/TestIterator.java index a6aaa3db357..7c5baa5e8b1 100644 --- a/test/functional/cmdline_options_tester/src/TestIterator.java +++ b/test/functional/cmdline_options_tester/src/TestIterator.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.*; diff --git a/test/functional/cmdline_options_tester/src/TestSuite.java b/test/functional/cmdline_options_tester/src/TestSuite.java index 06ce9ceefd5..a6665d6777c 100644 --- a/test/functional/cmdline_options_tester/src/TestSuite.java +++ b/test/functional/cmdline_options_tester/src/TestSuite.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.io.*; diff --git a/test/functional/cmdline_options_tester/src/Tokenizer.java b/test/functional/cmdline_options_tester/src/Tokenizer.java index 7d29c74b396..82148d0cf74 100644 --- a/test/functional/cmdline_options_tester/src/Tokenizer.java +++ b/test/functional/cmdline_options_tester/src/Tokenizer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.ArrayList; import java.util.List; diff --git a/test/functional/cmdline_options_tester/src/VariableAdder.java b/test/functional/cmdline_options_tester/src/VariableAdder.java index f9a8fbbcfc5..4180c679cc4 100644 --- a/test/functional/cmdline_options_tester/src/VariableAdder.java +++ b/test/functional/cmdline_options_tester/src/VariableAdder.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ class VariableAdder implements Command { diff --git a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/CharacterGroup.java b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/CharacterGroup.java index 043ea391e3f..45d49857b6e 100644 --- a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/CharacterGroup.java +++ b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/CharacterGroup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util.regex; diff --git a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Group.java b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Group.java index 93b8f8de822..5072c4a5f23 100644 --- a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Group.java +++ b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Group.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util.regex; diff --git a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/MalformedRegexException.java b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/MalformedRegexException.java index 835e0452ee0..5ab9d421de3 100644 --- a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/MalformedRegexException.java +++ b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/MalformedRegexException.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util.regex; diff --git a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/ModifiedGroup.java b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/ModifiedGroup.java index a0d3f7ce3e6..82c4afb3f77 100644 --- a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/ModifiedGroup.java +++ b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/ModifiedGroup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util.regex; diff --git a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Regex.java b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Regex.java index d328ee02fef..c25d6f96e19 100644 --- a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Regex.java +++ b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/Regex.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util.regex; diff --git a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/TextGroup.java b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/TextGroup.java index 04aaadd8b42..d3a66788fe3 100644 --- a/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/TextGroup.java +++ b/test/functional/cmdline_options_tester/src/com/ibm/oti/util/regex/TextGroup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.oti.util.regex; diff --git a/test/functional/cmdline_options_testresources/build.xml b/test/functional/cmdline_options_testresources/build.xml index 0e266452e06..d6c9343ef17 100644 --- a/test/functional/cmdline_options_testresources/build.xml +++ b/test/functional/cmdline_options_testresources/build.xml @@ -19,7 +19,7 @@ [1] https://www.gnu.org/software/classpath/license.html [2] https://openjdk.org/legal/assembly-exception.html - SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 --> diff --git a/test/functional/cmdline_options_testresources/src/Calculation.java b/test/functional/cmdline_options_testresources/src/Calculation.java index 9d87c460ec2..d5fb47a11d2 100644 --- a/test/functional/cmdline_options_testresources/src/Calculation.java +++ b/test/functional/cmdline_options_testresources/src/Calculation.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class Calculation { diff --git a/test/functional/cmdline_options_testresources/src/Dump.java b/test/functional/cmdline_options_testresources/src/Dump.java index c90d940fdf5..5fdd2ddd478 100644 --- a/test/functional/cmdline_options_testresources/src/Dump.java +++ b/test/functional/cmdline_options_testresources/src/Dump.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** diff --git a/test/functional/cmdline_options_testresources/src/JavaRuntimeVersion.java b/test/functional/cmdline_options_testresources/src/JavaRuntimeVersion.java index 8e5f740511f..54896947b68 100644 --- a/test/functional/cmdline_options_testresources/src/JavaRuntimeVersion.java +++ b/test/functional/cmdline_options_testresources/src/JavaRuntimeVersion.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ public class JavaRuntimeVersion { diff --git a/test/functional/cmdline_options_testresources/src/SystemProperties.java b/test/functional/cmdline_options_testresources/src/SystemProperties.java index d2537dff6b8..67c3b13c98d 100644 --- a/test/functional/cmdline_options_testresources/src/SystemProperties.java +++ b/test/functional/cmdline_options_testresources/src/SystemProperties.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import java.util.Enumeration; import java.util.Properties; diff --git a/test/functional/cmdline_options_testresources/src/VMBench/GPTests/GPTest.java b/test/functional/cmdline_options_testresources/src/VMBench/GPTests/GPTest.java index 9e0e32f284d..2958e2886f9 100644 --- a/test/functional/cmdline_options_testresources/src/VMBench/GPTests/GPTest.java +++ b/test/functional/cmdline_options_testresources/src/VMBench/GPTests/GPTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package VMBench.GPTests; diff --git a/test/functional/cmdline_options_testresources/src/WithDebugInfo.java b/test/functional/cmdline_options_testresources/src/WithDebugInfo.java index 6eda330e2bd..ff034b06eaf 100644 --- a/test/functional/cmdline_options_testresources/src/WithDebugInfo.java +++ b/test/functional/cmdline_options_testresources/src/WithDebugInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * Source Control Header diff --git a/test/functional/cmdline_options_testresources/src/WithoutDebugInfo.java b/test/functional/cmdline_options_testresources/src/WithoutDebugInfo.java index 28d96799447..06467268e12 100644 --- a/test/functional/cmdline_options_testresources/src/WithoutDebugInfo.java +++ b/test/functional/cmdline_options_testresources/src/WithoutDebugInfo.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /** * Source Control Header diff --git a/test/functional/cmdline_options_testresources/src/com/ibm/j9/getcallerclass/TestGroup.java b/test/functional/cmdline_options_testresources/src/com/ibm/j9/getcallerclass/TestGroup.java index 982abde91dd..604439c5b47 100644 --- a/test/functional/cmdline_options_testresources/src/com/ibm/j9/getcallerclass/TestGroup.java +++ b/test/functional/cmdline_options_testresources/src/com/ibm/j9/getcallerclass/TestGroup.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.getcallerclass; diff --git a/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/TestClass.java b/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/TestClass.java index 125c203baef..f6bd5dbf8a7 100644 --- a/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/TestClass.java +++ b/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/TestClass.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.zostest; diff --git a/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/ZosNativesTest.java b/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/ZosNativesTest.java index 078ab4f0064..a21865bbb29 100644 --- a/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/ZosNativesTest.java +++ b/test/functional/cmdline_options_testresources/src/com/ibm/j9/zostest/ZosNativesTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.zostest; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy1.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy1.java index be56a13298e..13477009165 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy1.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy1.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy10.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy10.java index 67cb5d8c600..b3a4ea553da 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy10.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy10.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy11.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy11.java index 8ec6ddb03df..4c2318557da 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy11.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy11.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy12.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy12.java index 21ab56ef3a2..18a620e6c68 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy12.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy12.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy13.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy13.java index d865f730a04..be022256b66 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy13.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy13.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy14.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy14.java index 3e35b39693d..723fe765fd9 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy14.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy14.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy2.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy2.java index 1dde69da2f1..3ae5b15d939 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy2.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy2.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy3.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy3.java index bc72732c0fa..c1b151b6ee9 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy3.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy3.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy4.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy4.java index ea483748414..0bdbd577c8b 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy4.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy4.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy5.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy5.java index a8b20691ab2..842e087ee27 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy5.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy5.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy6.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy6.java index 214cffb128b..df7e9820a1e 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy6.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy6.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy7.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy7.java index 44b1478f49f..7b77af6b4ba 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy7.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy7.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy8.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy8.java index ba07676f24b..ed489b62adf 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy8.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy8.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy9.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy9.java index cd9e1f58c3b..b453cd5e729 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy9.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/Dummy9.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/FastClassHashTableTest.java b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/FastClassHashTableTest.java index fbb5654ee1f..4b35c725918 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/FastClassHashTableTest.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/fastclasshashtable/FastClassHashTableTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.fastclasshashtable; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/BufferOverrun.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/BufferOverrun.java index 2baa5777bee..08976669bc0 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/BufferOverrun.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/BufferOverrun.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Mar 30, 2006 diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ConcurrentGlobalReferenceModification.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ConcurrentGlobalReferenceModification.java index 31751665070..29478c0a04b 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ConcurrentGlobalReferenceModification.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ConcurrentGlobalReferenceModification.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jnichk; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/CriticalAlwaysCopy.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/CriticalAlwaysCopy.java index 2869f5779c8..c883dc52faf 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/CriticalAlwaysCopy.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/CriticalAlwaysCopy.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jnichk; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/DeleteGlobalRefTwice.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/DeleteGlobalRefTwice.java index d8b89354622..5e7ba12b763 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/DeleteGlobalRefTwice.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/DeleteGlobalRefTwice.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on May 24, 2006 diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifiedBuffer.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifiedBuffer.java index b42da36796a..6a03c88608c 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifiedBuffer.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifiedBuffer.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on May 24, 2006 diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifyArrayData.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifyArrayData.java index 9560ee689cb..a5b85b32feb 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifyArrayData.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ModifyArrayData.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jnichk; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/PassingFieldID.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/PassingFieldID.java index ff4f76c84e7..635b2681d15 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/PassingFieldID.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/PassingFieldID.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jnichk; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ReturnInvalidReference.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ReturnInvalidReference.java index 803fca650ea..503ab944744 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ReturnInvalidReference.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/ReturnInvalidReference.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.jnichk; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/Test.java b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/Test.java index c2ce82fefb2..4d496a26273 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/Test.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/jnichk/Test.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ /* * Created on Mar 30, 2006 diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/RunningThreadsStackSizeTest.java b/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/RunningThreadsStackSizeTest.java index 27e46a91bef..ed341958a8a 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/RunningThreadsStackSizeTest.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/RunningThreadsStackSizeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.printstacktest; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/SystemExitCallStackSizeTest.java b/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/SystemExitCallStackSizeTest.java index a4e16660711..b81738ae33b 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/SystemExitCallStackSizeTest.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/printstacktest/SystemExitCallStackSizeTest.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package j9vm.test.printstacktest; diff --git a/test/functional/cmdline_options_testresources/src/j9vm/test/sigxfsz/SignalXfszTest.java b/test/functional/cmdline_options_testresources/src/j9vm/test/sigxfsz/SignalXfszTest.java index 5bde87c8867..a976674f5c9 100644 --- a/test/functional/cmdline_options_testresources/src/j9vm/test/sigxfsz/SignalXfszTest.java +++ b/test/functional/cmdline_options_testresources/src/j9vm/test/sigxfsz/SignalXfszTest.java @@ -19,7 +19,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ import static java.lang.System.*; diff --git a/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/GetCallerClassTests.java b/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/GetCallerClassTests.java index 840f23b1023..efe1a8beba4 100644 --- a/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/GetCallerClassTests.java +++ b/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/GetCallerClassTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.getcallerclass; diff --git a/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/RefectionMHTests.java b/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/RefectionMHTests.java index bf1af583ef8..d5ee177899e 100644 --- a/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/RefectionMHTests.java +++ b/test/functional/cmdline_options_testresources/src_80/com/ibm/j9/getcallerclass/RefectionMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.getcallerclass; diff --git a/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/GetCallerClassTests.java b/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/GetCallerClassTests.java index 034d885d69b..11abcd64164 100644 --- a/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/GetCallerClassTests.java +++ b/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/GetCallerClassTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.getcallerclass; diff --git a/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/RefectionMHTests.java b/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/RefectionMHTests.java index f85ccae12c9..6cf046f1a19 100644 --- a/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/RefectionMHTests.java +++ b/test/functional/cmdline_options_testresources/src_90/com/ibm/j9/getcallerclass/RefectionMHTests.java @@ -17,7 +17,7 @@ * [1] https://www.gnu.org/software/classpath/license.html * [2] https://openjdk.org/legal/assembly-exception.html * - * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception + * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0 *******************************************************************************/ package com.ibm.j9.getcallerclass;